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 /libxslt | |
| parent | 52de8bb56de4d0da94aa1528b7dc2f0f61f54aa6 (diff) | |
Build fixes for VC++ 10
Diffstat (limited to 'libxslt')
| -rw-r--r-- | libxslt/libxslt-vc10.patch | 15 | ||||
| -rw-r--r-- | libxslt/makefile.mk | 3 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libxslt/libxslt-vc10.patch b/libxslt/libxslt-vc10.patch new file mode 100644 index 000000000000..3d8b3302c643 --- /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 9a7be2e53532..2e6d1780b1fe 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" |