From bdf04730079523303a7c10c7af97ee5f67ad0a92 Mon Sep 17 00:00:00 2001 From: Tomofumi Yagi Date: Sat, 5 Apr 2014 12:02:38 +0900 Subject: Fix Windows build(external/coinmp) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes the problem that a linker misses CoinMP.dll. The problem will occurs when we use --enable-dbgutil option. Change-Id: If6cec0f9705db2af33cb9a69d9440e3053c5979a Reviewed-on: https://gerrit.libreoffice.org/8854 Reviewed-by: Matúš Kukan Tested-by: Matúš Kukan (cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a) --- external/coinmp/ExternalPackage_coinmp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'external') diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk index de01822622c1..bbea3ddc4df8 100644 --- a/external/coinmp/ExternalPackage_coinmp.mk +++ b/external/coinmp/ExternalPackage_coinmp.mk @@ -12,7 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,coinmp,coinmp)) $(eval $(call gb_ExternalPackage_use_external_project,coinmp,coinmp)) ifeq ($(OS),WNT) -$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/release/CoinMP.dll)) +$(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll)) else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbc.3.dylib,Cbc/src/.libs/libCbc.3.dylib)) $(eval $(call gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/libCbcSolver.3.dylib,Cbc/src/.libs/libCbcSolver.3.dylib)) -- cgit v1.2.3