[Libreoffice-commits] core.git: external/libxml2

[David Tardon]

 external/libxml2/libxml2-icu.patch.0 |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a8a3ad1e5f2c2539aae8067a3506a896b83389de
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 21 15:32:37 2014 +0200

    fix debug build of libxml2 on windows
    
    Change-Id: I36672c56742468cda8c0481b76ee6e3fec700983

diff --git a/external/libxml2/libxml2-icu.patch.0 b/external/libxml2/libxml2-icu.patch.0
index 6a9f8e4..f33e261 100644
--- a/external/libxml2/libxml2-icu.patch.0
+++ b/external/libxml2/libxml2-icu.patch.0
@@ -17,12 +17,16 @@ diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
  LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
  LIBS =
  !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
-@@ -78,7 +78,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
+@@ -78,7 +78,11 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib
  LIBS = $(LIBS) iconv.lib
  !endif 
  !if "$(WITH_ICU)" == "1"
 -LIBS = $(LIBS) icu.lib
++!if "$(DEBUG)" == "1"
++LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
++!else
 +LIBS = $(LIBS) icuin.lib icuuc.lib icudt.lib
++!endif
  !endif
  !if "$(WITH_ZLIB)" == "1"
  # could be named differently zdll or zlib