diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-14 13:52:56 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-15 15:26:32 +0200 |
| commit | 4811c2dc9f94929b60e7e2e0077871aad14fdc3a (patch) | |
| tree | 8754348c8dbdf9c4fb91e0d70346f96ee7455999 /icu | |
| parent | 3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3 (diff) | |
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
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/ExternalPackage_icu.mk | 20 | ||||
| -rw-r--r-- | icu/ExternalProject_icu.mk | 6 |
2 files changed, 15 insertions, 11 deletions
diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk index 785194ecbac7..169e81c70e95 100644 --- a/icu/ExternalPackage_icu.mk +++ b/icu/ExternalPackage_icu.mk @@ -33,18 +33,18 @@ $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ else $(eval $(call gb_ExternalPackage_add_files,icu,lib,\ - source/lib/icudt.lib \ - source/lib/icuuc.lib \ - source/lib/icuin.lib \ - source/lib/icule.lib \ - source/lib/icutu.lib\ + source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ + source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ + source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ + source/lib/icule$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \ + source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib\ )) $(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/lib/icudt$(ICU_MAJOR).dll \ - source/lib/icuuc$(ICU_MAJOR).dll \ - source/lib/icuin$(ICU_MAJOR).dll \ - source/lib/icule$(ICU_MAJOR).dll \ - source/lib/icutu$(ICU_MAJOR).dll \ + source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icule$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/bin/genccode.exe \ source/bin/genbrk.exe \ source/bin/gencmn.exe \ diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk index ecf97ec5c964..2df3011b15aa 100644 --- a/icu/ExternalProject_icu.mk +++ b/icu/ExternalProject_icu.mk @@ -19,11 +19,15 @@ icu_CPPFLAGS:="-DHAVE_GCC_ATOMICS=$(if $(filter TRUE,$(GCC_HAVE_BUILTIN_ATOMIC)) ifeq ($(OS),WNT) +# Note: runConfigureICU ignores everything following the platform name! ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,icu,build) : $(call gb_ExternalProject_run,build,\ export LIB="$(ILIB)" \ - && CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" ./runConfigureICU Cygwin/MSVC \ + && CFLAGS="$(SOLARINC)" CPPFLAGS="$(SOLARINC)" CXXFLAGS="$(SOLARINC)" \ + ./runConfigureICU \ + $(if $(MSVC_USE_DEBUG_RUNTIME),--enable-debug --disable-release) \ + Cygwin/MSVC \ && $(MAKE) \ ,source) else |