summaryrefslogtreecommitdiff
path: root/external/libxslt/libxslt-vc10.patch
blob: b50f0abe2e80efe8923aeaf0c8b2cf673821ef6d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
--- 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\