Adding separate paths for each different library build configurations

Resolved conflicts. Change-Id: I6ddad7de9e3047fc9ed93b44367f7f633831e3ea Reviewed-on: https://swiftshader-review.googlesource.com/1350Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com>

Adding separate paths for each different library build configurations
b36a4c50 · Alexis Hetu · Nicolas Capens · 7e12ac65 · b36a4c50 · b36a4c50
Commit b36a4c50 authored Nov 10, 2014 by Alexis Hetu Committed by Nicolas Capens Nov 10, 2014
5 changed files
--- a/src/OpenGL/compiler/Compiler.vcxproj
+++ b/src/OpenGL/compiler/Compiler.vcxproj
--- a/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
+++ b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
@@ -5,10 +5,18 @@
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}</ProjectGuid>
@@ -21,6 +29,12 @@
    <CharacterSet>NotSet</CharacterSet>
    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
@@ -28,15 +42,28 @@
    <CharacterSet>NotSet</CharacterSet>
    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -49,6 +76,16 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -63,6 +100,20 @@
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="Diagnostics.h" />
    <ClInclude Include="DirectiveHandler.h" />

--- a/src/OpenGL/libEGL/libEGL.vcxproj
+++ b/src/OpenGL/libEGL/libEGL.vcxproj
--- a/src/OpenGL/libGLESv2/libGLESv2.vcxproj
+++ b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
--- a/src/SwiftShader.sln
+++ b/src/SwiftShader.sln
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
+# Visual Studio 2013
 VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LLVM", "LLVM", "{B408B98A-E888-4ECF-81E0-7A37A6854B17}"
@@ -272,8 +272,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Debug|Win32.Build.0 = Debug|Win32
-		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Debug|x64.ActiveCfg = Debug|x64
-		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Debug|x64.Build.0 = Debug|x64
+		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Debug|x64.ActiveCfg = Debug|Win32
+		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Debug|x64.Build.0 = Debug|Win32
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Profile|Win32.ActiveCfg = Profile|Win32
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Profile|Win32.Build.0 = Profile|Win32
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Profile|x64.ActiveCfg = Profile|x64
@@ -284,8 +284,8 @@ Global
 		{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}.Release|x64.Build.0 = Release|x64
 		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Debug|Win32.ActiveCfg = Debug|Win32
 		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Debug|Win32.Build.0 = Debug|Win32
-		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Debug|x64.ActiveCfg = Debug|x64
-		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Debug|x64.Build.0 = Debug|x64
+		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Debug|x64.ActiveCfg = Debug|Win32
+		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Debug|x64.Build.0 = Debug|Win32
 		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Profile|Win32.ActiveCfg = Profile|Win32
 		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Profile|Win32.Build.0 = Profile|Win32
 		{28FD076D-10B5-4BD8-A4CF-F44C7002A803}.Profile|x64.ActiveCfg = Profile|x64
@@ -297,21 +297,27 @@ Global
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|Win32.Build.0 = Debug|Win32
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|x64.ActiveCfg = Debug|Win32
+		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Debug|x64.Build.0 = Debug|Win32
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Profile|Win32.ActiveCfg = Profile|Win32
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Profile|Win32.Build.0 = Profile|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Profile|x64.ActiveCfg = Profile|Win32
+		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Profile|x64.ActiveCfg = Profile|x64
+		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Profile|x64.Build.0 = Profile|x64
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.ActiveCfg = Release|Win32
 		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|Win32.Build.0 = Release|Win32
-		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|Win32
+		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.ActiveCfg = Release|x64
+		{B5871A7A-968C-42E3-A33B-981E6F448E78}.Release|x64.Build.0 = Release|x64
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|Win32.Build.0 = Debug|Win32
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|x64.ActiveCfg = Debug|Win32
+		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Debug|x64.Build.0 = Debug|Win32
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Profile|Win32.ActiveCfg = Profile|Win32
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Profile|Win32.Build.0 = Profile|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Profile|x64.ActiveCfg = Profile|Win32
+		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Profile|x64.ActiveCfg = Profile|x64
+		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Profile|x64.Build.0 = Profile|x64
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.ActiveCfg = Release|Win32
 		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|Win32.Build.0 = Release|Win32
-		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.ActiveCfg = Release|Win32
+		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.ActiveCfg = Release|x64
+		{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}.Release|x64.Build.0 = Release|x64
 		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Debug|Win32.Build.0 = Debug|Win32
 		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Debug|x64.ActiveCfg = Debug|x64
@@ -323,7 +329,6 @@ Global
 		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Release|Win32.ActiveCfg = Release|Win32
 		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Release|Win32.Build.0 = Release|Win32
 		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Release|x64.ActiveCfg = Release|x64
-		{97EDF19C-6360-4770-9255-EBA2F1A13E9B}.Release|x64.Build.0 = Release|x64
 		{7BE5F26F-0525-42BB-AAED-56C5B4582B99}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7BE5F26F-0525-42BB-AAED-56C5B4582B99}.Debug|Win32.Build.0 = Debug|Win32
 		{7BE5F26F-0525-42BB-AAED-56C5B4582B99}.Debug|x64.ActiveCfg = Debug|x64
@@ -530,8 +535,8 @@ Global
 		{9DEAA5E7-D432-4770-B96D-221B56D74FCC}.Release|x64.Build.0 = Release|x64
 		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Debug|Win32.ActiveCfg = Debug|Win32
 		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Debug|Win32.Build.0 = Debug|Win32
-		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Debug|x64.ActiveCfg = Debug|x64
-		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Debug|x64.Build.0 = Debug|x64
+		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Debug|x64.ActiveCfg = Debug|Win32
+		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Debug|x64.Build.0 = Debug|Win32
 		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Profile|Win32.ActiveCfg = Profile|Win32
 		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Profile|Win32.Build.0 = Profile|Win32
 		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Profile|x64.ActiveCfg = Profile|x64
@@ -542,8 +547,8 @@ Global
 		{531B1D71-5EE6-4576-971E-9CC28B0B3868}.Release|x64.Build.0 = Release|x64
 		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Debug|Win32.Build.0 = Debug|Win32
-		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Debug|x64.ActiveCfg = Debug|x64
-		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Debug|x64.Build.0 = Debug|x64
+		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Debug|x64.ActiveCfg = Debug|Win32
+		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Debug|x64.Build.0 = Debug|Win32
 		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Profile|Win32.ActiveCfg = Profile|Win32
 		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Profile|Win32.Build.0 = Profile|Win32
 		{E9B87B46-1EB0-4D95-9049-41B148FBADCD}.Profile|x64.ActiveCfg = Profile|x64
@@ -567,21 +572,27 @@ Global
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|Win32.Build.0 = Debug|Win32
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.ActiveCfg = Debug|Win32
+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Debug|x64.Build.0 = Debug|Win32
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Profile|Win32.ActiveCfg = Profile|Win32
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Profile|Win32.Build.0 = Profile|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Profile|x64.ActiveCfg = Profile|Win32
+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Profile|x64.ActiveCfg = Profile|x64
+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Profile|x64.Build.0 = Profile|x64
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.ActiveCfg = Release|Win32
 		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|Win32.Build.0 = Release|Win32
-		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|Win32
+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.ActiveCfg = Release|x64
+		{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}.Release|x64.Build.0 = Release|x64
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Debug|Win32.Build.0 = Debug|Win32
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Debug|x64.ActiveCfg = Debug|Win32
+		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Debug|x64.Build.0 = Debug|Win32
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Profile|Win32.ActiveCfg = Release|Win32
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Profile|Win32.Build.0 = Release|Win32
-		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Profile|x64.ActiveCfg = Release|Win32
+		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Profile|x64.ActiveCfg = Release|x64
+		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Profile|x64.Build.0 = Release|x64
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Release|Win32.ActiveCfg = Release|Win32
 		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Release|Win32.Build.0 = Release|Win32
-		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Release|x64.ActiveCfg = Release|Win32
+		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Release|x64.ActiveCfg = Release|x64
+		{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}.Release|x64.Build.0 = Release|x64
 		{9DAFEE32-19F6-4410-AA09-2B564FB86F62}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9DAFEE32-19F6-4410-AA09-2B564FB86F62}.Debug|Win32.Build.0 = Debug|Win32
 		{9DAFEE32-19F6-4410-AA09-2B564FB86F62}.Debug|x64.ActiveCfg = Debug|x64