diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2015-08-31 21:20:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-02 13:57:01 +0000 |
| commit | aae9c47270fed82c2f53f3d2cf701991c9c4a4a3 (patch) | |
| tree | b81577723d87bfc3985529ebd35d5a2c75d296c9 /external | |
| parent | fe22febbda04bc8e1b17348600857e4c4b29156e (diff) | |
Fix libgltf on MSVC 14.0
Change-Id: I3fda18b1d26e8c7ff509cdd33e44e75671c6157d
Reviewed-on: https://gerrit.libreoffice.org/18212
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libgltf/ExternalProject_libgltf.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk index 877092ca0a4b..ce4aced308ad 100644 --- a/external/libgltf/ExternalProject_libgltf.mk +++ b/external/libgltf/ExternalProject_libgltf.mk @@ -43,8 +43,8 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) : msbuild.exe libgltf.vcxproj /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ $(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 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ + $(if $(filter 140,$(VCVER)),/p:PlatformToolset=v140 /p:VisualStudioVersion=14.0 /ToolsVersion:14.0) \ '/p:AdditionalIncludeDirectories=$(subst $(WHITESPACE),;,$(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) |