bump product version to 4.1.6.2
[LibreOffice.git] / libxml2 / libxml2-vc10.patch
blobf29858029b27cef04e2a1dcdaf847585c807de40
1 --- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200
2 +++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200
3 @@ -59,6 +59,7 @@
4 CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H"
5 !endif
6 CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
7 +CFLAGS = $(CFLAGS) $(SOLARINC)
9 # The linker and its options.
10 LD = link.exe
11 @@ -91,8 +91,12 @@
12 LDFLAGS = $(LDFLAGS) /DEBUG
13 !else
14 CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
15 +!if "$(_NMAKE_VER)" >= "10.00.30319.01"
16 +LDFLAGS = $(LDFLAGS)
17 +!else
18 LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
19 !endif
20 +!endif
22 # Libxml object files.
23 XML_OBJS = $(XML_INTDIR)\c14n.obj\