diff options
| author | Tomofumi Yagi <yagit@mknada.sakura.ne.jp> | 2014-04-05 12:02:38 +0900 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-05 01:01:13 -0500 |
| commit | cddbec75d402e260d6997ad69377346a8aa5774a (patch) | |
| tree | 28db02e893186d53dfadb10df389471e447c4a3c /external/coinmp | |
| parent | 7d3a899f0ea4311b216b8398751d33a88b83d6ec (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>
Diffstat (limited to 'external/coinmp')
| -rw-r--r-- | external/coinmp/ExternalPackage_coinmp.mk | 2 |
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)) |