RepositoryExternal.mk | 12 ++++++++++--
external/coinmp/ExternalPackage_coinmp.mk | 5 ++++-
external/coinmp/ExternalProject_coinmp.mk | 2 +-
external/coinmp/windows.build.patch.1 | 16 ++++++++++++++++
4 files changed, 31 insertions(+), 4 deletions(-)
New commits:
commit 152e2a2eb7ccd63900d8cfbd8ada47fa75891cbb
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Sun Nov 30 18:26:01 2014 +0100
coinmp: Don't hard code Win32 platform on Windows
Change-Id: I39eafa22b12e62c766a182c2ebc2b115084f4cef
Reviewed-on: https://gerrit.libreoffice.org/13231
Reviewed-by: David Ostrovsky <da...@ostrovsky.org>
Tested-by: David Ostrovsky <da...@ostrovsky.org>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 06088c8..5799da2 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),\
diff --git a/external/coinmp/ExternalPackage_coinmp.mk
b/external/coinmp/ExternalPackage_coinmp.mk
index 694a886..23fbb10 100644
--- a/external/coinmp/ExternalPackage_coinmp.mk
+++ b/external/coinmp/ExternalPackage_coinmp.mk
@@ -12,7 +12,10 @@ $(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/$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
+ifeq ($(CPUNAME),X86_64)
+coinmp_arch_subdir=x64/
+endif
+$(eval $(call
gb_ExternalPackage_add_file,coinmp,$(LIBO_LIB_FOLDER)/CoinMP.dll,CoinMP/MSVisualStudio/v9/$(coinmp_arch_subdir)$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)/CoinMP.dll))
else ifneq ($(DISABLE_DYNLOADING),)
# Just use the static archives from workdir. See bin/lo-all-static-libs
else ifeq ($(OS),MACOSX)
diff --git a/external/coinmp/ExternalProject_coinmp.mk
b/external/coinmp/ExternalProject_coinmp.mk
index c140d0e..4a7122d 100644
--- a/external/coinmp/ExternalProject_coinmp.mk
+++ b/external/coinmp/ExternalProject_coinmp.mk
@@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
$(call gb_ExternalProject_run,build,\
MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- /p:Platform=Win32 \
+ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120
/p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9)
diff --git a/external/coinmp/windows.build.patch.1
b/external/coinmp/windows.build.patch.1
index 560f9ba..e2e292e 100644
--- a/external/coinmp/windows.build.patch.1
+++ b/external/coinmp/windows.build.patch.1
@@ -2150,6 +2150,22 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP.sln
coinmp/CoinMP/MSVisualS
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+@@ -121,6 +123,7 @@
+ {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|Win32.Build.0 =
Debug|Win32
+ {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.ActiveCfg =
Debug|x64
++ {175F0674-F0B9-479C-9C9D-76969C06D794}.Debug|x64.Build.0 =
Debug|x64
+ {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Any
CPU.ActiveCfg = Release|Win32
+ {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {175F0674-F0B9-479C-9C9D-76969C06D794}.Release|Mixed
Platforms.Build.0 = Release|Win32
+@@ -134,6 +137,7 @@
+ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|Win32.Build.0 =
Debug|Win32
+ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|x64.ActiveCfg =
Debug|x64
++ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Debug|x64.Build.0 =
Debug|x64
+ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Any
CPU.ActiveCfg = Release|Win32
+ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Mixed
Platforms.ActiveCfg = Release|Win32
+ {9F2D36EA-6D9E-42CB-A648-BCC0CB3E68E6}.Release|Mixed
Platforms.Build.0 = Release|Win32
diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
--- coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj
1970-01-01 01:00:00.000000000 +0100
+++ coinmp/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj 2014-02-28
15:32:36.564600694 +0100
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
