external/libxml2/libxml2-icu.patch.0

   1 diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
   2 --- win32/Makefile.msvc.dt      2014-07-18 19:00:23.372103963 +0200
   3 +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200
   4 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
   5  CC = cl.exe
   6  CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME)
   7  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
   8 +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
   9  !if "$(WITH_THREADS)" != "no"
  10  CFLAGS = $(CFLAGS) /D "_REENTRANT"
  11  !endif
  12 @@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC)
  13  # The linker and its options.
  14  LD = link.exe
  15  LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
  16 +LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib
  17  LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
  18  LIBS =
  19  !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
  20 @@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
  21  LIBS = $(LIBS) iconv.lib
  22  !endif
  23  !if "$(WITH_ICU)" == "1"
  24 -LIBS = $(LIBS) icu.lib
  25 +!if "$(WITH_RUN_DEBUG)" == "1"
  26 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
  27 +!else
  28 +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib
  29 +!endif
  30  !endif
  31  !if "$(WITH_ZLIB)" == "1"
  32  # could be named differently zdll or zlib