diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-07-06 22:34:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-07-09 11:44:54 +0000 |
| commit | 90334404e2bf9ced73f60793dc90056e1fd99938 (patch) | |
| tree | dd9565723872aca9b0c80b67bd55b3e3109e5984 /external | |
| parent | 9b597430c632b8c20a7595f998cd26a02e1f8656 (diff) | |
Glew: Fix compilation on VS 2015
Change-Id: I3749c18b344e5b76a542a336de0792337d329065
Reviewed-on: https://gerrit.libreoffice.org/16802
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/glew/ExternalProject_glew.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index 4403a4e1c0fe..852c7b644bd5 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -16,13 +16,14 @@ $(eval $(call gb_ExternalProject_register_targets,glew,\ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,build,\ + $(if $(filter 140,$(VCVER)),$(DEVENV) /Upgrade glew.sln,echo up-to-date) && \ 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)) \ + ,build/vc12) \ $(call gb_ExternalProject_run,build,\ msbuild.exe glewinfo.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) /p:Configuration=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)) + ,build/vc12) else |