diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external/curl/curl-msvc.patch.1 | |
| parent | Initial commit. (diff) | |
| download | libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.tar.xz libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/curl/curl-msvc.patch.1')
| -rw-r--r-- | external/curl/curl-msvc.patch.1 | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 new file mode 100644 index 000000000..a5b79a8e9 --- /dev/null +++ b/external/curl/curl-msvc.patch.1 @@ -0,0 +1,27 @@ +MSVC: using SOLARINC + +--- curl/winbuild/MakefileBuild.vc.orig 2017-10-23 16:36:07.713550851 +0200 ++++ curl/winbuild/MakefileBuild.vc 2017-10-23 16:38:19.301547594 +0200 +@@ -60,7 +60,7 @@ + !ELSE + CC_NODEBUG = $(CC) /O2 /DNDEBUG + CC_DEBUG = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd +-CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL ++CFLAGS = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL $(SOLARINC) + !ENDIF + + LFLAGS = /nologo /machine:$(MACHINE) +@@ -300,11 +300,11 @@ + # CURL_XX macros are for the curl.exe command + + !IF "$(DEBUG)"=="yes" +-RC_FLAGS = /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc ++RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc + CURL_CC = $(CC_DEBUG) $(RTLIB_DEBUG) + CURL_RC_FLAGS = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc + !ELSE +-RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc ++RC_FLAGS = $(SOLARINC) /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc + CURL_CC = $(CC_NODEBUG) $(RTLIB) + CURL_RC_FLAGS = $(CURL_RC_FLAGS) /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc + !ENDIF |