summaryrefslogtreecommitdiff
path: root/external/libgltf
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-09 16:06:09 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-09 16:47:52 +0200
commit0b684fa3e919dea3a482f85580c1266b81598f70 (patch)
treec428f1552c7259e1785788325eacd9ace2c31ef4 /external/libgltf
parent227f3aab1791ffde82fe930ea1c9f7ed4ed2d82d (diff)
VS2013: Override ToolsVersion setting
Otherwise those external projects will fail, because with only VS2013 installed there is no ToolsVersion 4.0 (which is set inside the VC projects files). http://msdn.microsoft.com/en-us/library/bb383985.aspx Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
Diffstat (limited to 'external/libgltf')
-rw-r--r--external/libgltf/ExternalProject_libgltf.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index cd84dcd981e4..c402e59db245 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -43,7 +43,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
msbuild.exe libgltf.vcxproj \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
- $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0) \
+ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \