diff options
| author | Jesús Corrius <jesus@softcatala.org> | 2010-10-20 01:10:02 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-20 19:17:40 +0200 |
| commit | 48ace782ff36f8b9615eb25230666035cacf4f71 (patch) | |
| tree | 0b6c6703dbe8a8a6bc68f6e0ccb2a0ff65477681 /libxml2 | |
| parent | 52de8bb56de4d0da94aa1528b7dc2f0f61f54aa6 (diff) | |
Build fixes for VC++ 10
Diffstat (limited to 'libxml2')
| -rwxr-xr-x | libxml2/libxml2-vc10.patch | 15 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libxml2/libxml2-vc10.patch b/libxml2/libxml2-vc10.patch new file mode 100755 index 000000000000..54d12f19c484 --- /dev/null +++ b/libxml2/libxml2-vc10.patch @@ -0,0 +1,15 @@ +--- 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\ diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index c9677f0831d9..0c69c36b74a5 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -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 |