diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-05-26 11:39:06 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-05-26 11:39:06 +0200 |
commit | 09c0a96eb3ea8d48e99ed50ae7d13d23f70a0c6c (patch) | |
tree | bc0aa89b14204eb8aa22b63adf265fc37763f80c /external/freetype/ExternalProject_freetype.mk | |
parent | coverity#736092 Improper use of negative value (diff) | |
download | core-09c0a96eb3ea8d48e99ed50ae7d13d23f70a0c6c.tar.gz core-09c0a96eb3ea8d48e99ed50ae7d13d23f70a0c6c.zip |
externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
Diffstat (limited to 'external/freetype/ExternalProject_freetype.mk')
-rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/freetype/ExternalProject_freetype.mk b/external/freetype/ExternalProject_freetype.mk index 17f2a5d3b1e6..0c1c513c98ed 100644 --- a/external/freetype/ExternalProject_freetype.mk +++ b/external/freetype/ExternalProject_freetype.mk @@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,freetype,build) : $(call gb_ExternalProject_run,build,\ cd ../builds/win32/vc2010/ && \ msbuild.exe freetype.vcxproj /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ - $(if $(filter 110,$(VCVER)),/p:PlatformToolset=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) \ ,objs) else $(call gb_ExternalProject_get_state_target,freetype,build) : |