mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 00:41:37 +08:00
3a26eb3dc4
* [fontconfig] update fontconfig * [libiconv] update to make * [gettext] update to make * [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig * [fontconfig] make it work on windows * Remove install of unofficial cmake config * add function get_cmake_vars * fine tuning. * apply to make based ports. * add log suffix on not windows platforms * fix c&p error * add previous LINK env * setup env on windows and extract cpp flags correctly. * update glib and libxml2 * fix windows regressions * Apply suggestions from code review * add windres wrapper to invoke RC. * remove wrong fi * fix libintl. * try fixing uwp * other things to update * exiv2 fix * libtool does not like -RTC1 * pass the /RTC<x> flag directly to the compiler * trust cmake instead of adding extra flags * fix expat * fix iconv wrapper install * change fontconfig intl linkage. * add appcontainer back in which is required for UWP. Why is this not in the cmake flags? * fix pkg-config in vcpkg_configure_make * fix json-c pkg-config installation * remove remnoved config * comment out debug messages + bit of tuning * finally fontconfig * comment debug messages * expat apply extra patches. * Switch back to -E instead of -EP in cpp * commit changes from fontconfig PR * [expat] fix expat details * Apply suggestions from code review Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * cleanup docs * update osx pipeline so that fontconfig actually builds * fix expat the lazy way by using a higher commit than release * fix a barage of regressions due to the use of unofficial targets * [expat] use a higher commit hash with a better stabilized cmake build * forgot freexl regression * more unofficial fixes * fix downstream expat usage * fix wxwidgets * fix gcdm regression * [vtk] fix the regression due to expat * add uwp cl flags back in. Somehow those are not set by cmake * add a few other configure options for full gettext build * fix cmake regression * fix a few regressions * fix static gettext build * fix gettext static * fix libxml2 wrapper for cmake * some more regressions fixes * add conversion from somelib.lib to -lsomelib * add a few option to libiconv. * get logs from CI * add missing ar-lib wrapper * add missing ar-lib wrapper * add fatal error to gettext * remove uuid from the list of LIBS since it seems to not exist in CI? * small but important regex correction * fix regex and add debug message for libs * remove error and only build libintl. * add uuid dependency to fontconfig in qt5-base * osx install gettext for autopoint * fix io2d regression by saying the port is broken ..... (which it is; upstream needs to learn proper cmake) * restore the old libxml2 wrapper with minor modifications * fix xmlsec regression * install wrapper correctly * try actual fixing io2d * improve iconv wrapper * add latest changes from update_fontconfig PR * Apply suggestions from code review first set which don't need special attention Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply suggestions from code review one more simple change Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [x264] set env AS * fix bugs due to refactor * use subpath everywhere * apply changes from CR * fix fontconfig build. * only change libs in static builds * remove unnecessary lines 41 & 44 * remove flag transformation * reintroduce the flag / to - transformation for MSVC * trying to figure out autopoint issue. using wrong (windows) find.exe instead of msys * add correct working_dir to subpath * escape stupid env paths. * fix typo * add findutils remove debug messages * add error if libtool chokes * add file to msys * pass lt_cv_deplibs_check_method=pass_all on windows (couldn't get file.exe to work so that libtool correctly ids the passed libs) * add bzip2 to msys * reenable libtool check. Lets see if CI agrees * unbreak linux try to figure out where uuid should be on windows. * add -L flag and help libtool ? * try to get ci to find uuid. * try to use cygpath * update controls * cleanup merge mistakes * correct merge issues * determine cmake vars if not done before. * move adding of -l earlier * more merge cleanup * fix uwp builds by not transforming libs * fix patches in io2d * fix xz download error * apply code review changes manually * fix the typos left behind in CR Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
---
|
|
win32/Makefile.msvc | 29 +++++++++++++++--------------
|
|
1 file changed, 15 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
|
|
index 23a02d2..b13dd26 100644
|
|
--- a/win32/Makefile.msvc
|
|
+++ b/win32/Makefile.msvc
|
|
@@ -59,7 +59,13 @@ CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
|
|
LD = link.exe
|
|
LDFLAGS = /nologo
|
|
LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
|
|
-LIBS = wsock32.lib
|
|
+# The libraries are needed for static builds (the makefile builds all tools and dlls)
|
|
+LIBS = wsock32.lib iconv.lib charset.lib
|
|
+!if "$(DEBUG)" == "1"
|
|
+LIBS = $(LIBS) zlibd.lib
|
|
+!else
|
|
+LIBS = $(LIBS) zlib.lib
|
|
+!endif
|
|
|
|
# The archiver and its options.
|
|
AR = lib.exe
|
|
@@ -71,6 +77,7 @@ CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
|
|
LDFLAGS = $(LDFLAGS) /DEBUG
|
|
!else
|
|
CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
|
|
+LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF /OPT:ICF
|
|
!endif
|
|
|
|
# Libxslt object files.
|
|
@@ -309,13 +316,7 @@ $(UTILS_INTDIR) :
|
|
# An implicit rule for xsltproc and friends.
|
|
APPLIBS = $(LIBS)
|
|
!if "$(STATIC)" == "1"
|
|
-APPLIBS = $(LIBS) libxml2_a.lib
|
|
-!if "$(WITH_ICONV)" == "1"
|
|
-APPLIBS = $(APPLIBS) iconv.lib
|
|
-!endif
|
|
-!if "$(WITH_ZLIB)" == "1"
|
|
-APPLIBS = $(APPLIBS) zlib.lib
|
|
-!endif
|
|
+APPLIBS = $(LIBS) libxml2.lib
|
|
{$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
|
|
$(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \
|
|
$(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $<
|
|
--
|