Kaydet (Commit) 48ace782 authored tarafından Jesús Corrius's avatar Jesús Corrius Kaydeden (comit) Fridrich Štrba

Build fixes for VC++ 10

üst 52de8bb5
--- misc/build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200
+++ misc/build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200
@@ -91,8 +91,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
# Libxml object files.
XML_OBJS = $(XML_INTDIR)\c14n.obj\
......@@ -52,7 +52,8 @@ PATCH_FILES=libxml2-configure.patch \
libxml2-mingw.patch \
libxml2-gnome599717.patch \
libxml2-global-symbols.patch \
libxml2-aix.patch
libxml2-aix.patch \
libxml2-vc10.patch
# This is only for UNX environment now
......
--- misc/build/libxslt-1.1.26/win32/Makefile.msvc.old 2010-10-20 01:02:55.359375000 +0200
+++ misc/build/libxslt-1.1.26/win32/Makefile.msvc 2010-10-20 01:03:05.187500000 +0200
@@ -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\
......@@ -56,7 +56,8 @@ PATCH_FILES=libxslt-configure.patch \
libxslt-win_manifest.patch \
libxslt-mingw.patch \
libxslt-internal-symbols.patch \
libxslt-aix.patch
libxslt-aix.patch \
libxslt-vc10.patch
# This is only for UNX environment now
.IF "$(OS)"=="WNT"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment