mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#100295 force curl to build for XP

Browse Source 
Change-Id: Ia705704bc80a951f0da04936783dd8965bda842b
Reviewed-on: https://gerrit.libreoffice.org/26886
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Markus Mohrhard
2016-07-04 03:53:03 +02:00
committed by Christian Lohmaier
parent c56974019c
commit dc4797a79e
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
external/curl/UnpackedTarball_curl.mk vendored
View File

@@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/curl-msvc-schannel.patch.1 \ external/curl/curl-msvc-schannel.patch.1 \
external/curl/curl-7.26.0_mingw.patch \ external/curl/curl-7.26.0_mingw.patch \
external/curl/curl-7.26.0_win-proxy.patch \ external/curl/curl-7.26.0_win-proxy.patch \
external/curl/curl-xp.patch.1 \
)) ))
ifeq ($(SYSTEM_NSS),) ifeq ($(SYSTEM_NSS),)

12
external/curl/curl-xp.patch.1 vendored Normal file
View File

@@ -0,0 +1,12 @@
diff -ur curl.org/src/Makefile.vc10 curl/src/Makefile.vc10
--- curl.org/src/Makefile.vc10 2016-07-04 03:45:24.102995951 +0200
+++ curl/src/Makefile.vc10 2016-07-04 03:48:00.547835559 +0200
@@ -127,7 +127,7 @@
LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
RCD = rc.exe /dDEBUGBUILD=1
-CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
+CFLAGS = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1 /D_WIN32_WINNT=0x0502
LFLAGS = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
RESFLAGS = /i../include