commit 2b9fb4bf5ece8b42101a21693aac22b3f16983f4
author Nicolas Capens <capn@google.com> Tue Mar 26 15:43:08 2019 -0400
committer Nicolas Capens <nicolascapens@google.com> Wed Apr 03 03:33:45 2019 +0000
tree 4187cedf70e8f6eaa1d13efc2bceaed405439a78
parent 047568864d9f74ab1eb123957831f8e3c5edffca

Switch to LLVM 7.0 for Visual Studio solution

Uses llvm.vcxproj generated by build/cmake.sh

Bug b/115344057

Change-Id: I09041d219f194e5ec97daad6b1b247a565909e98
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/28110
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>

build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj

diff --git a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj
index dea4d79..555f85a 100644
--- a/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj
+++ b/build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spirv-tools-pkg-config.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <PropertyGroup>

     <PreferredToolArchitecture>x64</PreferredToolArchitecture>

@@ -14,7 +14,7 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectGuid>{EC5297D9-ED1C-3BE6-BF71-3D76CD9B2AA7}</ProjectGuid>

+    <ProjectGuid>{96492351-1995-3B6B-A091-E7F4918E443B}</ProjectGuid>

     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>

     <Keyword>Win32Proj</Keyword>

     <Platform>x64</Platform>

@@ -65,7 +65,7 @@
     </Midl>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\27d298d334ba2598781edad1159af4a3\spirv-tools-pkg-config.rule">

+    <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\94aa4ac18413140bb96afa28d59cf59e\spirv-tools-pkg-config.rule">

       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>

       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal

 "cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include "-DSPIRV_LIBRARIES=-lSPIRV-Tools -lSPIRV-Tools-link -lSPIRV-Tools-opt" -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake

@@ -76,7 +76,7 @@
 exit /b %1

 :cmDone

 if %errorlevel% neq 0 goto :VCEnd</Command>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/27d298d334ba2598781edad1159af4a3/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/94aa4ac18413140bb96afa28d59cf59e/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>

       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>

@@ -89,7 +89,7 @@
 exit /b %1

 :cmDone

 if %errorlevel% neq 0 goto :VCEnd</Command>

-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/27d298d334ba2598781edad1159af4a3/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>

+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/94aa4ac18413140bb96afa28d59cf59e/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>

       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs>

       <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>

     </CustomBuild>