From 4811c2dc9f94929b60e7e2e0077871aad14fdc3a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sun, 14 Apr 2013 13:52:56 +0200 Subject: adapt all externals to build against MSVC debug runtime Add patches and/or tweaks to the following modules: curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec, lpsolve, nss, openssl, python3 lcms2 has an inconsistency where the .lib and the .dll don't agree on the .dll name. openssl gets a honorable mention because apparently it's undocumented custom build system can build with /MDd if one picks the right configuration but i couldn't figure out how to do that in an hour of trying, and just patched the release config instead. Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c --- curl/ExternalProject_curl.mk | 3 ++- curl/curl-7.26.0_win.patch | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'curl') diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk index a503c15a414d..bbb2b1c807f4 100644 --- a/curl/ExternalProject_curl.mk +++ b/curl/ExternalProject_curl.mk @@ -49,7 +49,8 @@ else ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_run,build,\ - MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc9 cfg=release-dll \ + MAKEFLAGS= LIB="$(ILIB)" nmake -f Makefile.vc9 \ + cfg=$(if $(MSVC_USE_DEBUG_RUNTIME),debug-dll,release-dll) \ EXCFLAGS="/EHa /Zc:wchar_t- /D_CRT_SECURE_NO_DEPRECATE /DUSE_WINDOWS_SSPI $(SOLARINC)" $(if $(filter X86_64,$(CPUNAME)),MACHINE=X64) \ ,lib) diff --git a/curl/curl-7.26.0_win.patch b/curl/curl-7.26.0_win.patch index bcc357c045f4..0b3eed2d2eb6 100644 --- a/curl/curl-7.26.0_win.patch +++ b/curl/curl-7.26.0_win.patch @@ -43,7 +43,14 @@ CFGSET = FALSE -@@ -620,5 +620,5 @@ +@@ -620,11 +620,11 @@ + debug-dll-ssl-dll\libcurl.res \ + debug-dll-zlib-dll\libcurl.res \ + debug-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc +- rc /dDEBUGBUILD=1 /Fo $@ libcurl.rc ++ rc $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ libcurl.rc + + release-dll\libcurl.res \ release-dll-ssl-dll\libcurl.res \ release-dll-zlib-dll\libcurl.res \ release-dll-ssl-dll-zlib-dll\libcurl.res: libcurl.rc -- cgit