321c2d4426
Part of the configure is upstreamed, drop those 3 hunks. Change-Id: I5f2ad217aaba050969cb655091f33fe61970a512
30 lines
1.0 KiB
Groff
30 lines
1.0 KiB
Groff
From d5548168e6e25a96e2cad3c68534c57a0a890fca Mon Sep 17 00:00:00 2001
|
|
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
Date: Fri, 4 Mar 2016 16:12:29 +0100
|
|
Subject: [PATCH] xmlsec1-vc.patch
|
|
|
|
Conflicts:
|
|
win32/Makefile.msvc
|
|
---
|
|
win32/Makefile.msvc | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
|
|
index e34c3e9f..aedb0188 100644
|
|
--- a/win32/Makefile.msvc
|
|
+++ b/win32/Makefile.msvc
|
|
@@ -312,6 +312,10 @@ 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) /D "XMLSEC_NO_GOST" /D "XMLSEC_NO_GOST2012"
|
|
+CFLAGS = $(CFLAGS) -arch:SSE $(SOLARINC) -I$(WORKDIR)\UnpackedTarball\libxml2\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"
|
|
--
|
|
2.13.5
|
|
|