summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTomofumi Yagi <yagit@mknada.sakura.ne.jp>2014-04-05 12:02:38 +0900
committerMatúš Kukan <matus.kukan@collabora.com>2014-04-08 10:20:24 +0200
commitbdf04730079523303a7c10c7af97ee5f67ad0a92 (patch)
tree9f055a946df9a2400578e0ee41df2d0faf79f944 /external
parentc06d624c81bafba1b61052aa5078d10f023e276b (diff)
Fix Windows build(external/coinmp)
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 <matus.kukan@collabora.com> Tested-by: Matúš Kukan <matus.kukan@collabora.com> (cherry picked from commit cddbec75d402e260d6997ad69377346a8aa5774a)
Diffstat (limited to 'external')
-rw-r--r--external/coinmp/ExternalPackage_coinmp.mk2
1 files changed, 1 insertions, 1 deletions
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))