[Libreoffice-commits] core.git: external/coinmp RepositoryExternal.mk

[Tomofumi Yagi]

 RepositoryExternal.mk                     |    2 +-
 external/coinmp/ExternalPackage_coinmp.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cddbec75d402e260d6997ad69377346a8aa5774a
Author: Tomofumi Yagi <yagit at mknada.sakura.ne.jp>
Date:   Sat Apr 5 12:02:38 2014 +0900

    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 at collabora.com>
    Tested-by: Matúš Kukan <matus.kukan at collabora.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f6a4e2b..2892a71 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2032,7 +2032,7 @@ define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/release/CoinMP.lib \
+	$(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \
 )
 else
 $(call gb_LinkTarget_add_libs,$(1),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk b/external/coinmp/ExternalPackage_coinmp.mk
index de01822..bbea3dd 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))