diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-14 09:07:04 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-06-14 19:53:32 +0200 |
| commit | df2f8116733fdf98ff6216afbfda62af4723f7e2 (patch) | |
| tree | a0a4c21dd99ca62e887760ca5c27118300842398 /external | |
| parent | 0646f3ef7cd036b899f7b8ef3a897eecb298994c (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch.1 | 13 |
1 files changed, 0 insertions, 13 deletions
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 |