external/glew/ExternalProject_glew.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit f4afc39514eeca61f56907b7fee1e82bf8d1c239
Author: David Ostrovsky <da...@ostrovsky.org>
Date: Tue Jul 8 23:44:57 2014 +0200
VS2013: Adjust glew to 12.0 vcproj version
Change-Id: Ibfb6f7d23c0f3afbd7ef810093dbbec7f9134aaa
Reviewed-on: https://gerrit.libreoffice.org/10160
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/glew/ExternalProject_glew.mk
b/external/glew/ExternalProject_glew.mk
index de1ba93..d7e553b 100644
--- a/external/glew/ExternalProject_glew.mk
+++ b/external/glew/ExternalProject_glew.mk
@@ -17,7 +17,8 @@ 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) \
- $(if $(filter 110 120,$(VCVER)),/p:PlatformToolset=$(if
$(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
+ $(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) \
,build/vc10)
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
