external/libxml2/libxml2-icu.patch.0

   1 Find bundled ICU in workdir and use debug .libs when needed
   2
   3 diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
   4 --- win32/Makefile.msvc.dt      2014-07-18 19:00:23.372103963 +0200
   5 +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200
   6 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
   7  CC = cl.exe
   8  CFLAGS = /nologo /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(CRUNTIME)
   9  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
  10 +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
  11  !if "$(WITH_THREADS)" != "no"
  12  CFLAGS = $(CFLAGS) /D "_REENTRANT"
  13  !endif
  14 @@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC)
  15  # The linker and its options.
  16  LD = link.exe
  17  LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
  18 +LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib
  19  LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
  20  LIBS =
  21  !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
  22 @@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
  23  !if "$(STATIC)" == "1"
  24  LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
  25  !else
  26 +!if "$(DEBUG)" == "1"
  27 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
  28 +!else
  29  LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
  30 +!endif
  31  !endif
  32  !endif
  33  !if "$(WITH_ZLIB)" == "1"