forked from amazingfate/loongoffice
f0167eced7
Obsoletes xmlsec1-win32-fix-undeclared.patch.1. Change-Id: I11cd52aebbe5ab224de9ab00b74c02abb46296f6 Reviewed-on: https://gerrit.libreoffice.org/30539 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
41 lines
1.3 KiB
Groff
41 lines
1.3 KiB
Groff
From c821fea172b4ffdb60f65867862dd48049589ea6 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
|
|
|
|
---
|
|
win32/Makefile.msvc | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
|
|
index bbc661a..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
|
|
|