diff options
| author | Jesús Corrius <jesus@softcatala.org> | 2010-10-20 01:15:54 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-10-20 19:17:19 +0200 |
| commit | 36ad473eeeace151af341869b0436fac8b1bdd2e (patch) | |
| tree | 9dfdd7e24acf7b686e71ed03db559b2f4050f803 /libxmlsec | |
| parent | b5de1d11886014f09d2aa73a39ac669bd0641fad (diff) | |
Build fixes for VC++ 10
Diffstat (limited to 'libxmlsec')
| -rw-r--r-- | libxmlsec/makefile.mk | 7 | ||||
| -rw-r--r-- | libxmlsec/xmlsec1-vc10.patch | 15 |
2 files changed, 19 insertions, 3 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index b7dff3e52bed..ffa92f583cee 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -55,7 +55,8 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f #xmlsec1-nssmangleciphers.patch: Dubious, do we still need this ? #xmlsec1-noverify.patch: As per readme.txt. #xmlsec1-mingw32.patch: Mingw32 support. -#xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw +#xmlsec1-mingw-customkeymanage-addmscrypto.patch: builds the custom keymanager on mingw +#xmlsec1-vc.path: support for Visual C++ 10 PATCH_FILES=\ xmlsec1-configure.patch \ xmlsec1-configure-libxml-libxslt.patch \ @@ -65,8 +66,8 @@ PATCH_FILES=\ xmlsec1-nssmangleciphers.patch \ xmlsec1-noverify.patch \ xmlsec1-mingw32.patch \ - xmlsec1-mingw-keymgr-mscrypto.patch - + xmlsec1-mingw-keymgr-mscrypto.patch \ + xmlsec1-vc10.patch ADDITIONAL_FILES= \ include$/xmlsec$/mscrypto$/akmngr.h \ diff --git a/libxmlsec/xmlsec1-vc10.patch b/libxmlsec/xmlsec1-vc10.patch new file mode 100644 index 000000000000..72a1d2147cde --- /dev/null +++ b/libxmlsec/xmlsec1-vc10.patch @@ -0,0 +1,15 @@ +--- misc/build/xmlsec1-1.2.14/win32/Makefile.msvc.old 2010-10-20 00:49:04.671875000 +0200 ++++ misc/build/xmlsec1-1.2.14/win32/Makefile.msvc 2010-10-20 00:49:23.406250000 +0200 +@@ -351,7 +351,11 @@ + !if "$(DEBUG)" == "1" + LDFLAGS = $(LDFLAGS) /DEBUG + !else +-LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 ++!if "$(_NMAKE_VER)" >= "10.00.30319.01" ++LDFLAGS = $(LDFLAGS) ++!else ++LDFLAGS = $(LDFLAGS) /OPT:NOWIN98 ++!endif + !endif + + SOLIBS = $(LIBS) libxml2.lib |