OSDN Git Service

Default to 64-bit MSVC toolchain
authorNicolas Capens <capn@google.com>
Thu, 28 Mar 2019 14:54:21 +0000 (10:54 -0400)
committerNicolas Capens <nicolascapens@google.com>
Wed, 3 Apr 2019 03:33:45 +0000 (03:33 +0000)
Prevents linking issues with LLVM 7.0.

Bug b/115344057

Change-Id: I7270c2bcf6095b1ec9911074b3119f87680a7cad
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28168
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
23 files changed:
src/D3D8/D3D8.vcxproj
src/D3D9/D3D9.vcxproj
src/OpenGL/compiler/Compiler.vcxproj
src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
src/OpenGL/libEGL/libEGL.vcxproj
src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
src/OpenGL/libGLESv2/libGLESv2.vcxproj
src/Reactor/Reactor.vcxproj
src/Reactor/ReactorUnitTests.vcxproj
src/Reactor/Subzero.vcxproj
src/Reactor/SubzeroLLVMDependencies.vcxproj
src/SwiftShader/SwiftShader.vcxproj
src/Vulkan/vulkan.vcxproj
tests/GLESUnitTests/GLESUnitTests.vcxproj
tests/VulkanUnitTests/VulkanUnitTests.vcxproj
tests/fuzzers/VertexRoutineFuzzer.vcxproj
third_party/PowerVR_SDK/Examples/Advanced/ChameleonMan/OGLES2/Build/WindowsVC2010/OGLES2ChameleonMan.vcxproj
third_party/PowerVR_SDK/Examples/Beginner/01_HelloAPI/OGLES2/Build/WindowsVC2010/OGLES2HelloAPI.vcxproj
third_party/PowerVR_SDK/Examples/Beginner/04_BasicTnL/OGLES/Build/WindowsVC2010/OGLESBasicTnL.vcxproj
third_party/PowerVR_SDK/Examples/Intermediate/ColourGrading/OGLES3/Build/WindowsVC2010/OGLES3ColourGrading.vcxproj
third_party/PowerVR_SDK/Examples/Intermediate/DisplacementMap/OGLES2/Build/WindowsVC2010/OGLES2DisplacementMap.vcxproj
third_party/PowerVR_SDK/Tools/OGLES2/Build/WindowsVC2010/OGLES2Tools.vcxproj
third_party/PowerVR_SDK/Tools/OGLES3/Build/WindowsVC2010/OGLES3Tools.vcxproj

index 0f493a0..8b132f9 100644 (file)
@@ -18,6 +18,7 @@
     <ProjectGuid>{F18D5ABF-CA3A-4B74-BDB2-4A1956C86F18}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index 665caa0..327c1bc 100644 (file)
@@ -30,6 +30,7 @@
     <ProjectGuid>{F18D5ABF-CA3A-4B74-BDB2-4A1957C86F18}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index e797db1..9bf609e 100644 (file)
@@ -32,6 +32,7 @@
     <Keyword>Win32Proj</Keyword>\r
     <ProjectName>Compiler</ProjectName>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index f01592a..07f364d 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}</ProjectGuid>\r
     <RootNamespace>preprocessor</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index bfc2132..de4a076 100644 (file)
@@ -31,6 +31,7 @@
     <RootNamespace>libEGL</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index a720f24..b5da9ce 100644 (file)
@@ -31,6 +31,7 @@
     <RootNamespace>libGLES_CM</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index 8748629..a384d9f 100644 (file)
@@ -31,6 +31,7 @@
     <RootNamespace>libGLESv2</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index 60c15c5..7e01bc5 100644 (file)
@@ -31,6 +31,7 @@
     <RootNamespace>Reactor</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index 3a89929..89a161d 100644 (file)
@@ -23,6 +23,7 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>ReactorUnitTests</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 58bb4b7..8866f16 100644 (file)
@@ -23,6 +23,7 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>Subzero</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 8b951e3..dbae0f8 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{E3BBD7DA-45C1-43EF-9C87-3F411031BDE4}</ProjectGuid>\r
     <RootNamespace>SubzeroLLVMDependencies</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 9cd839d..2752d42 100644 (file)
@@ -30,6 +30,7 @@
     <ProjectGuid>{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}</ProjectGuid>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index 79ef0dd..c60dd20 100644 (file)
@@ -16,6 +16,7 @@
     <RootNamespace>vulkan</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
     <ProjectName>Vulkan</ProjectName>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
index 3942209..c5ebb19 100644 (file)
@@ -23,6 +23,7 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>GLESUnitTests</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 92cddba..4f7782e 100644 (file)
@@ -15,6 +15,7 @@
     <Keyword>Win32Proj</Keyword>\r
     <RootNamespace>GLESUnitTests</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
index 8363d9a..1fdd18c 100644 (file)
@@ -23,6 +23,7 @@
     <ProjectGuid>{FBDCFF88-0CE1-43C3-B694-8F45946FAFE3}</ProjectGuid>\r
     <RootNamespace>VertexRoutineFuzzer</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 5a2172f..9e9e451 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{9CF4408B-9B08-481F-95DA-3DF0846DABE4}</ProjectGuid>\r
     <RootNamespace>OGLES2ChameleonMan</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 5642f5a..79dc5f7 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{9DAFEE32-19F6-4410-AA09-2B564FB86F62}</ProjectGuid>\r
     <RootNamespace>OGLES2HelloAPI</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 9545fb0..ff797e8 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}</ProjectGuid>\r
     <RootNamespace>OGLESBasicTnL</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 6792196..f01450f 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{2EA5725B-25DA-44E2-B71E-BD9F55F3C2E2}</ProjectGuid>\r
     <RootNamespace>OGLES3ColourGrading</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index 36b95f6..ca2c7e3 100644 (file)
@@ -22,6 +22,7 @@
     <ProjectGuid>{04FC5430-3F1B-42A2-A18A-D8BB7E5B2733}</ProjectGuid>\r
     <RootNamespace>OGLES2DisplacementMap</RootNamespace>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
index df193fa..de4eda8 100644 (file)
@@ -23,6 +23,7 @@
     <RootNamespace>OGLES2Tools</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
index 8c190f7..49b789e 100644 (file)
@@ -23,6 +23,7 @@
     <RootNamespace>OGLES3Tools</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>\r
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r