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 | 298daab62dc5963c0d8fa76c0ede56efbf7c1490 (patch) | |
| tree | e3e465c1cc943c8d9897c49111841a0039e63ca0 | |
| parent | 24e8e3a3a616a800621a1646b985a51a245bdee1 (diff) | |
Build fixes for VC++ 10
| -rwxr-xr-x | libxml2/libxml2-vc10.patch | 15 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 3 | ||||
| -rw-r--r-- | libxslt/libxslt-vc10.patch | 15 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 3 |
4 files changed, 34 insertions, 2 deletions
diff --git a/libxml2/libxml2-vc10.patch b/libxml2/libxml2-vc10.patch new file mode 100755 index 0000000..54d12f1 --- /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 c9677f0..0c69c36 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 diff --git a/libxslt/libxslt-vc10.patch b/libxslt/libxslt-vc10.patch new file mode 100644 index 0000000..3d8b330 --- /dev/null +++ b/libxslt/libxslt-vc10.patch @@ -0,0 +1,15 @@ +--- 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\ diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index 9a7be2e..2e6d178 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -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" |