calc: on editing invalidation of view with different zoom is wrong
[LibreOffice.git] / external / libxml2 / libxml2-icu-sym.patch.0
blob07676228da1943a6531c31c2762d0dab9916b661
1 Find bundled ICU in workdir and use debug .libs when needed
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 @@ -46,6 +46,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 @@ -62,7 +63,9 @@
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 +LDFLAGS = $(LDFLAGS) /DEBUG /OPT:REF
21  LIBS =
22  !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
23  LIBS = $(LIBS) wsock32.lib ws2_32.lib
24 @@ -74,9 +77,13 @@
25  !if "$(STATIC)" == "1"
26  LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
27  !else
28 +!if "$(DEBUG)" == "1"
29 +LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
30 +!else
31  LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
32  !endif
33  !endif
34 +!endif
35  !if "$(WITH_ZLIB)" == "1"
36  # could be named differently zdll or zlib
37  # LIBS = $(LIBS) zdll.lib