diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2014-11-30 19:19:13 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-02 14:38:10 +0000 |
| commit | ce0513a9ee79d29f38db6b6b2bbc662826350eb6 (patch) | |
| tree | a51432a93a2a9cd82c998cd7f0f9086e02d3f8b2 /external | |
| parent | 74b2cdd48992c3627586887d67638fc87125ca94 (diff) | |
glew: Don't hard code Win32 platform on Windows
Change-Id: I753602314f0ed3822bce489e9e427a1de77d2431
Reviewed-on: https://gerrit.libreoffice.org/13230
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/glew/ExternalPackage_glew.mk | 10 | ||||
| -rw-r--r-- | external/glew/ExternalProject_glew.mk | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/external/glew/ExternalPackage_glew.mk b/external/glew/ExternalPackage_glew.mk index a110f702e8f8..6678a6934b15 100644 --- a/external/glew/ExternalPackage_glew.mk +++ b/external/glew/ExternalPackage_glew.mk @@ -11,12 +11,20 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,glew,glew)) $(eval $(call gb_ExternalPackage_use_external_project,glew,glew)) +ifeq ($(OS)-$(COM),WNT-MSC) +ifeq ($(CPUNAME),INTEL) +glew_arch_subdir=Win32 +else ifeq ($(CPUNAME),X86_64) +glew_arch_subdir=x64 +endif +endif + ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.1.10.0.dylib,lib/libGLEW.1.10.0.dylib)) else ifeq ($(OS)-$(COM),WNT-GCC) else ifeq ($(COM),MSC) $(eval $(call gb_ExternalPackage_add_files,glew,$(LIBO_LIB_FOLDER), \ - bin/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/Win32/glew32d.dll,Release/Win32/glew32.dll) \ + bin/$(if $(MSVC_USE_DEBUG_RUNTIME),Debug/$(glew_arch_subdir)/glew32d.dll,Release/$(glew_arch_subdir)/glew32.dll) \ )) else ifeq ($(filter IOS ANDROID,$(OS)),) $(eval $(call gb_ExternalPackage_add_file,glew,$(LIBO_LIB_FOLDER)/libGLEW.so.1.10,lib/libGLEW.so.1.10.0)) diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index 54348f5321df..714972cec878 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -16,7 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,glew,\ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,build,\ - msbuild.exe glew_shared.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ + msbuild.exe glew_shared.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ ,$(if $(filter 120,$(VCVER)),build/vc12,build/vc10)) |