forked from amazingfate/loongoffice
fd6cbd983a
'checked' field removed with:ce76ebfd13win32 'run_debug' removed with:59f2f60e3eadd libxml2-XMLCALL-redefine.patch.0 to avoid: UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the following warning is treated as an error UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 'XMLCALL': macro redefinition UnpackedTarball\expat\lib\expat_external.h(69): note: see previous definition of 'XMLCALL' Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
34 lines
1.3 KiB
Plaintext
34 lines
1.3 KiB
Plaintext
Find bundled ICU in workdir and use debug .libs when needed
|
|
|
|
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 "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W3 /wd4244 /wd4267 $(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
|
|
!if "$(STATIC)" == "1"
|
|
LIBS = $(LIBS) advapi32.lib sicuuc.lib sicuin.lib sicudt.lib
|
|
!else
|
|
+!if "$(DEBUG)" == "1"
|
|
+LIBS = $(LIBS) icuind.lib icuucd.lib icudtd.lib
|
|
+!else
|
|
LIBS = $(LIBS) icuuc.lib icuin.lib icudt.lib
|
|
+!endif
|
|
!endif
|
|
!endif
|
|
!if "$(WITH_ZLIB)" == "1"
|