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 bbee1ebf52cec72cc5213f33a4e5ed82939a2add
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Wed Jan 22 02:28:49 2025 +0200
Fix issues with the coinmp build on Windows/amd64.
Patch by: me
---
ext_libraries/coinmp/makefile.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ext_libraries/coinmp/makefile.mk b/ext_libraries/coinmp/makefile.mk
index 32189f1a4f..3163aa59b3 100644
--- a/ext_libraries/coinmp/makefile.mk
+++ b/ext_libraries/coinmp/makefile.mk
@@ -50,8 +50,10 @@ PATCH_FILES=coinmp-1.7.6.patch coinmp-1.7.6-clang.patch
coinmp-1.7.6-clang-1.8.p
PATCH_FILES+=coinmp-1.6.0-os2.patch
.ENDIF
-.IF "$(COM)"=="MSC"
+.IF "$(COM)$(CPU)"=="MSCI"
BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv
CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|Win32"
+.ELIF "$(COM)$(CPU)"=="MSCX"
+BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv
CoinMP\\MSVisualStudio\\v9\\CoinMP.sln "Release|x64"
.ELSE
CONFIGURE_ACTION=./configure
#CONFIGURE_FLAGS=--disable-pkg-config --disable-bzlib --disable-zlib CC='$(CC)
$(ARCH_FLAGS)' CXX='$(CXX) $(ARCH_FLAGS)' CFLAGS='$(ARCH_FLAGS) -Wc,-arch
-Wc,i386' CPPFLAGS='$(ARCH_FLAGS)' LDFLAGS='$(ARCH_FLAGS)'
compiler_flags='$(ARCH_FLAGS)'
@@ -66,9 +68,12 @@ CONFIGURE_FLAGS+= --disable-shared --enable-static
OUT2INC+=CoinMP$/src/CoinMP.h
-.IF "$(OS)"=="WNT"
+.IF "$(OS)$(CPU)"=="WNTI"
OUT2BIN+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.dll
OUT2LIB+=CoinMP$/MSVisualStudio$/v9$/release$/CoinMP.lib
+.ELIF "$(OS)$(CPU)"=="WNTX"
+OUT2BIN+=CoinMP$/MSVisualStudio$/v9$/x64$/Release$/CoinMP.dll
+OUT2LIB+=CoinMP$/MSVisualStudio$/v9$/x64$/Release$/CoinMP.lib
.ELIF "$(OS)"=="OS2"
OUT2BIN+=CoinMP$/src$/CoinMP.dll
OUT2LIB+=CoinMP$/src$/.libs/CoinMP.lib
