forked from amazingfate/loongoffice
391bcf348d
- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same) - drop libxml2-vc15.patch (fixed upstream) Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116 Reviewed-on: https://gerrit.libreoffice.org/20084 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
33 lines
1.3 KiB
Plaintext
33 lines
1.3 KiB
Plaintext
diff -up win32/Makefile.msvc.dt win32/Makefile.msvc
|
|
--- win32/Makefile.msvc.dt 2014-07-18 19:00:23.372103963 +0200
|
|
+++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200
|
|
@@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
|
|
CC = cl.exe
|
|
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME)
|
|
CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
|
|
+CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common
|
|
!if "$(WITH_THREADS)" != "no"
|
|
CFLAGS = $(CFLAGS) /D "_REENTRANT"
|
|
!endif
|
|
@@ -67,6 +68,7 @@ CFLAGS = $(CFLAGS) $(SOLARINC)
|
|
# The linker and its options.
|
|
LD = link.exe
|
|
LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
|
|
+LDFLAGS = $(LDFLAGS) /LIBPATH:$(WORKDIR)/UnpackedTarball/icu/source/lib
|
|
LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
|
|
LIBS =
|
|
!if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
|
|
@@ -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 "$(WITH_RUN_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
|