summaryrefslogtreecommitdiff
path: root/external/libgltf
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-06-25 17:05:11 +0200
committerMichael Stahl <mstahl@redhat.com>2014-06-25 17:05:11 +0200
commit96ff10449464ae9d869fe21dccf193a6eef670c1 (patch)
tree02ad0eb478e00415f56e249ac47bf462ca5df36b /external/libgltf
parentdfe787ef5de1b38e61989507b26ee4b92f25b9d5 (diff)
libgltf: try to fix the MSVC2010 build
Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758
Diffstat (limited to 'external/libgltf')
-rw-r--r--external/libgltf/ExternalProject_libgltf.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 9d043cdbb01a..46a74d48ff01 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -44,7 +44,9 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
msbuild.exe libgltf.vcxproj \
/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) \
+ /p:VisualStudioVersion=11.0) \
+ $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
+ /p:VisualStudioVersion=10.0) \
'/p:AdditionalIncludeDirectories=$(subst $(gb_SPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
/p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)