This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 35dc6591b5 Fix the curl debug build on Windows.
35dc6591b5 is described below
commit 35dc6591b52b8600d3d748e4c6e49719362a54e5
Author: Damjan Jovanovic <[email protected]>
AuthorDate: Sun Feb 2 16:03:16 2025 +0200
Fix the curl debug build on Windows.
It always copied the "release" binaries, which don't exist on
debug builds.
Patch by: me
---
main/curl/makefile.mk | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/main/curl/makefile.mk b/main/curl/makefile.mk
index f17ba876d9..96bcd80dab 100644
--- a/main/curl/makefile.mk
+++ b/main/curl/makefile.mk
@@ -119,11 +119,25 @@ BUILD_ACTION=CC="cl.exe" nmake -f Makefile.vc mode=dll
VC=9 DEBUG=yes EXCFLAGS=$
.ENDIF
.IF "$(CPUNAME)"=="INTEL"
+
+.IF "$(debug)"=""
OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ssl-dll-zlib-dll-ipv6-sspi/bin/libcurl.dll
OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-release-dll-ssl-dll-zlib-dll-ipv6-sspi/lib/libcurl.lib
+.ELSE
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi/bin/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi/lib/libcurl.lib
+.ENDIF
+
.ELIF "$(CPUNAME)"=="X86_64"
+
+.IF "$(debug)"=""
OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ssl-dll-zlib-dll-ipv6-sspi/bin/libcurl.dll
OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-release-dll-ssl-dll-zlib-dll-ipv6-sspi/lib/libcurl.lib
+.ELSE
+OUT2BIN=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi/bin/libcurl.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi/lib/libcurl.lib
+.ENDIF
+
.ENDIF
.ENDIF
