diff options
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 |