external/libxmlsec/xmlsec1-vc.patch.1 | 13 -------------
1 file changed, 13 deletions(-)
New commits:
commit df2f8116733fdf98ff6216afbfda62af4723f7e2
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Jun 14 09:07:04 2017 +0200
xmlsec: drop vc9 hunk from xmlsec1-vc.patch.1
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 <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1
b/external/libxmlsec/xmlsec1-vc.patch.1
index a82af307da0f..bfd130503f45 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -24,19 +24,6 @@ index 8156caa7..ef1909ce 100644
!if "$(UNICODE)" == "1"
CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE"
-@@ -363,7 +367,11 @@ LIBS =
- !if "$(DEBUG)" == "1"
- LDFLAGS = $(LDFLAGS) /DEBUG
- !else
--LDFLAGS = $(LDFLAGS)
-+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
-+LDFLAGS = $(LDFLAGS)
-+!else
-+LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
-+!endif
- !endif
-
- SOLIBS = $(LIBS) libxml2.lib
--
2.12.0
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
