2012-11-29 20:50:15 -05:00
|
|
|
--- build/xmlsec1-1.2.14/win32/Makefile.msvc.old 2010-10-20 00:49:04.671875000 +0200
|
|
|
|
|
+++ 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
|
|
|
|
|
--- build/xmlsec/win32/Makefile.msvc.old 2012-11-30 11:09:23.130479800 -0500
|
|
|
|
|
+++ build/xmlsec/win32/Makefile.msvc 2012-11-30 11:11:06.037550700 -0500
|
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-14 13:52:56 +02:00
|
|
|
@@ -301,6 +301,10 @@
|
2012-11-29 20:50:15 -05:00
|
|
|
CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
|
|
|
|
|
CFLAGS = $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
|
|
|
|
|
CFLAGS = $(CFLAGS) /D "HAVE_MALLOC_H" /D "HAVE_MEMORY_H"
|
2014-10-01 23:15:26 +02:00
|
|
|
+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common
|
adapt all externals to build against MSVC debug runtime
Add patches and/or tweaks to the following modules:
curl, cppunit, icu, lcms2, libxml2, libxslt, libxmlsec,
lpsolve, nss, openssl, python3
lcms2 has an inconsistency where the .lib and the .dll don't agree on
the .dll name.
openssl gets a honorable mention because apparently it's undocumented
custom build system can build with /MDd if one picks the right
configuration but i couldn't figure out how to do that in an hour of
trying, and just patched the release config instead.
Change-Id: I7854a0fc85247e398d561b4f513d09fe2d1ebb3c
2013-04-14 13:52:56 +02:00
|
|
|
+!if "$(MSVC_USE_DEBUG_RUNTIME)" != ""
|
|
|
|
|
+CFLAGS = $(CFLAGS) /MDd
|
|
|
|
|
+!endif
|
2012-11-29 20:50:15 -05:00
|
|
|
|
|
|
|
|
# Optimisation and debug symbols.
|
|
|
|
|
!if "$(DEBUG)" == "1"
|
