b9d6c7a48c
Change-Id: Ie6ae2150e1f011e17034abcace18c5967b4dacf5 Reviewed-on: https://gerrit.libreoffice.org/2023 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Peter Foley <pefoley2@verizon.net>
23 lines
816 B
Diff
23 lines
816 B
Diff
--- build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200
|
|
+++ build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200
|
|
@@ -54,6 +54,7 @@
|
|
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
|
|
CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
|
|
CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
|
|
+CFLAGS = $(CFLAGS) $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include
|
|
|
|
# The linker and its options.
|
|
LD = link.exe
|
|
@@ -71,8 +71,12 @@
|
|
LDFLAGS = $(LDFLAGS) /DEBUG
|
|
!else
|
|
CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
|
|
+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
|
|
+LDFLAGS = $(LDFLAGS)
|
|
+!else
|
|
LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
|
|
!endif
|
|
+!endif
|
|
|
|
# Libxslt object files.
|
|
XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\
|