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:43:00 +0200 |
| commit | 82e3391c0eaf63bc315b649036dd0ab149bf3b5f (patch) | |
| tree | 802b2352ef2fac8452790a5274e8e2baf4b14c3c /external | |
| parent | 0fe1835dd0cf7c6ca077278acc6bd1bfe79294bd (diff) | |
externals: do not use "v110_xp" when building with MSVC 2012 and SDK 8.0
Change-Id: I40bc9e4c31e270f29cc145b5d2f3544cad586bf7
(cherry picked from commit 09c0a96eb3ea8d48e99ed50ae7d13d23f70a0c6c)
Diffstat (limited to 'external')
| -rw-r--r-- | external/coinmp/ExternalProject_coinmp.mk | 2 | ||||
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 4 | ||||
| -rw-r--r-- | external/freetype/ExternalProject_freetype.mk | 2 | ||||
| -rw-r--r-- | external/glew/ExternalProject_glew.mk | 2 | ||||
| -rw-r--r-- | external/lcms2/ExternalProject_lcms2.mk | 2 | ||||
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 3 |
6 files changed, 9 insertions, 6 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index 71e19826220a..b483d4573d71 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=Win32 \ $(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \ - $(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) \ ,CoinMP/MSVisualStudio/v9) else diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 30a5905bcc00..2f3217da3d2b 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -16,7 +16,9 @@ $(eval $(call gb_ExternalProject_register_targets,cppunit,\ ifeq ($(OS)$(COM),WNTMSC) $(call gb_ExternalProject_get_state_target,cppunit,build) : $(call gb_ExternalProject_run,build,\ - PROFILEFLAGS="$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) $(if $(filter 110,$(VCVER)),/p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0)" \ + PROFILEFLAGS="$(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)" \ && msbuild.exe cppunit_dll.vcxproj /p:Configuration=$${PROFILEFLAGS} \ && cd ../DllPlugInTester \ && msbuild.exe DllPlugInTester.vcxproj /p:Configuration=$${PROFILEFLAGS} \ 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) : diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index 79b4a58a7001..918d275284cd 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -17,7 +17,7 @@ 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,$(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) \ ,build/vc10) else diff --git a/external/lcms2/ExternalProject_lcms2.mk b/external/lcms2/ExternalProject_lcms2.mk index 1636bae6127a..82664ae327dc 100644 --- a/external/lcms2/ExternalProject_lcms2.mk +++ b/external/lcms2/ExternalProject_lcms2.mk @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,lcms2,build): MSBuild.exe lcms2_DLL.vcxproj \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Platform=Win32 /p:TargetName=lcms2 \ - $(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) \ ,Projects/VC2010/lcms2_DLL) else $(call gb_ExternalProject_get_state_target,lcms2,build): diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 0bbd9b5f27bf..42c3dffdd917 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -37,7 +37,8 @@ $(call gb_ExternalProject_get_state_target,python3,build) : /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ $(if $(filter 100,$(VCVER)), \ /ToolsVersion:4.0, \ - /p:PlatformToolset=v110_xp /p:VisualStudioVersion=11.0) \ + /p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ + /p:VisualStudioVersion=11.0) \ && cd $(EXTERNAL_WORKDIR) \ && ln -s PCbuild LO_lib \ ,PCBuild) |