fix debug build of libxml2 on windows, version 2

Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f

fix debug build of libxml2 on windows, version 2
Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f
6831ae4d · David Tardon · acd2c909 · 6831ae4d · 6831ae4d
Kaydet (Commit) 6831ae4d authored Tem 21, 2014 tarafından David Tardon
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ExternalProject_xml2.mk external/libxml2/ExternalProject_xml2.mk +1 -1

libxml2-icu.patch.0 external/libxml2/libxml2-icu.patch.0 +1 -1

No files found.
--- a/external/libxml2/ExternalProject_xml2.mk
+++ b/external/libxml2/ExternalProject_xml2.mk
@@ -33,7 +33,7 @@ $(call gb_ExternalProject_use_external_project,xml2,icu)
 $(call gb_ExternalProject_get_state_target,xml2,build):
 	$(call gb_ExternalProject_run,build,\
 		cscript configure.js \
-			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \
+			iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),run_debug=yes cruntime=/MDd) \
 		&& unset MAKEFLAGS \
 		&& LIB="$(ILIB)" nmake \
 	,win32)

--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -22,7 +22,7 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
 !endif 
 !if "$(WITH_ICU)" == "1"
 -LIBS = $(LIBS) icu.lib
-+!if "$(DEBUG)" != ""
+!if "$(WITH_RUN_DEBUG)" == "1"
 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
 +!else
 +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib