You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2026/02/21 14:25:43 UTC
(openoffice) 01/04: Fix the curl debug build on Windows. It always copied the "release" binaries, which don't exist in debug builds. Also on amd64, the binaries have a "_debug" suffix.
This is an automated email from the ASF dual-hosted git repository.
damjan pushed a commit to branch windows-amd64
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 73bcf912b95884e9bef09c783349f0b7cfa68715
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Feb 20 03:58:33 2026 +0200
Fix the curl debug build on Windows.
It always copied the "release" binaries, which don't exist in debug builds.
Also on amd64, the binaries have a "_debug" suffix.
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..95a96bc02a 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_debug.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi/lib/libcurl_debug.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_debug.dll
+OUT2LIB=$(BUILD_DIR)$/../builds/libcurl-vc9-X64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi/lib/libcurl_debug.lib
+.ENDIF
+
.ENDIF
.ENDIF