external/glew/ExternalProject_glew.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 90334404e2bf9ced73f60793dc90056e1fd99938
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Mon Jul 6 22:34:16 2015 +0200
Glew: Fix compilation on VS 2015
Change-Id: I3749c18b344e5b76a542a336de0792337d329065
Reviewed-on: https://gerrit.libreoffice.org/16802
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/glew/ExternalProject_glew.mk
b/external/glew/ExternalProject_glew.mk
index 4403a4e..852c7b6 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
