forked from amazingfate/loongoffice
df2f811673
This was added in commit 36ad473eeeace151af341869b0436fac8b1bdd2e (Build fixes for VC++ 10, 2010-10-20) where it was only safe to conditionally add support for Visual Studio 2010. Change-Id: I62c4aefd39a5943259a5a1e462f4762c1aac5e1e Reviewed-on: https://gerrit.libreoffice.org/38768 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
30 lines
1.0 KiB
Groff
30 lines
1.0 KiB
Groff
From 223ae3881bedb8070774271ab4300a447f94f845 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 | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
|
|
index 8156caa7..ef1909ce 100644
|
|
--- a/win32/Makefile.msvc
|
|
+++ b/win32/Makefile.msvc
|
|
@@ -311,6 +311,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\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"
|
|
--
|
|
2.12.0
|
|
|