From 8586bb027cde6713a9048472917c75095e186643 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 4 Mar 2016 16:12:29 +0100 Subject: [PATCH] xmlsec1-vc.patch --- win32/Makefile.msvc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index 978336e..a474592 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -311,6 +311,10 @@ CFLAGS = $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\" 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" +CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\xml2\include -I$(WORKDIR)/UnpackedTarball/icu/source/i18n -I$(WORKDIR)/UnpackedTarball/icu/source/common +!if "$(MSVC_USE_DEBUG_RUNTIME)" != "" +CFLAGS = $(CFLAGS) /MDd +!endif !if "$(UNICODE)" == "1" CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE" @@ -365,7 +369,11 @@ LIBS = !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 -- 2.6.6