diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-11-30 18:26:01 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2015-01-08 10:40:53 +0000 |
| commit | 152e2a2eb7ccd63900d8cfbd8ada47fa75891cbb (patch) | |
| tree | d1b382bdda357afc6e86ebed1ea217c10dc02b92 /RepositoryExternal.mk | |
| parent | 1b5b918626c4210d1472db17a080460e7ca3d7c9 (diff) | |
coinmp: Don't hard code Win32 platform on Windows
Change-Id: I39eafa22b12e62c766a182c2ebc2b115084f4cef
Reviewed-on: https://gerrit.libreoffice.org/13231
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Tested-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 06088c8f1510..5799da2a6ed5 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -27,6 +27,14 @@ # in the system case, no libraries should be registered, but the target-local # variable LIBS should be set to FOO_LIBS, and INCLUDES to FOO_CFLAGS. + +ifeq ($(CPUNAME),X86_64) +wnt_arch_subdir_optional=x64/ +wnt_arch_subdir_mandatory=x64 +else ifeq ($(CPUNAME),INTEL) +wnt_arch_subdir_mandatory=Win32 +endif + # External headers ifneq ($(SYSTEM_MESA_HEADERS),) @@ -262,7 +270,7 @@ $(call gb_LinkTarget_set_include,$(1),\ ifeq ($(COM),MSC) $(call gb_LinkTarget_add_libs,$(1),\ - $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.lib,Release/Win32/glew32.lib) \ + $(call gb_UnpackedTarball_get_dir,glew)/lib/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(wnt_arch_subdir_mandatory)/glew32d.lib,Release/$(wnt_arch_subdir_mandatory)/glew32.lib) \ ) else $(call gb_LinkTarget_add_libs,$(1),\ @@ -2320,7 +2328,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/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \ + $(call gb_UnpackedTarball_get_dir,coinmp)/CoinMP/MSVisualStudio/v9/$(wnt_arch_subdir_optional)$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.lib \ ) else $(call gb_LinkTarget_add_libs,$(1),\ |