ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Build fixes for VC++ 10

Browse Source
This commit is contained in:
Jesús Corrius
2010-10-20 19:17:19 +02:00
committed by Fridrich Štrba
parent b5de1d1188
commit 36ad473eee
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libxmlsec/makefile.mk
+4 -3
View File
@@ -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 \
libxmlsec/xmlsec1-vc10.patch
+15
View File
@@ -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