Fix the compiler copy script in the public projects.

This patch silences the copy message, fixes the public projects, and makes the copy step a separate target, so it won't run on every incremental build. Change-Id: Ie6df39737ad466b6431865b3ca19f66d16437ba9 Reviewed-on: https://chromium-review.googlesource.com/178432Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Fix the compiler copy script in the public projects.
89a13e9e · Jamie Madill · 319cb329 · 89a13e9e · 89a13e9e · 89a13e9e
Commit 89a13e9e authored Dec 03, 2013 by Jamie Madill
17 changed files
--- a/projects/build/All.vcxproj
+++ b/projects/build/All.vcxproj
@@ -125,6 +125,10 @@
      <Project>{3B7F5656-177F-52EE-26B3-D6A75368D0A9}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="..\src\copy_compiler_dll.vcxproj">
+      <Project>{22DC02D5-1598-943C-13E1-82185B469F81}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
    <ProjectReference Include="..\src\libGLESv2.vcxproj">
      <Project>{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

--- a/projects/build/all.sln
+++ b/projects/build/all.sln
@@ -6,6 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048
 		{C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5}
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
+		{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
 		{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061}
 		{293E74D1-544C-D368-02A0-52F61A4D0679} = {293E74D1-544C-D368-02A0-52F61A4D0679}
@@ -25,6 +26,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "All", "All.vcxproj", "{D048
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es_util", "..\samples\es_util.vcxproj", "{80E5C3D9-93C2-943E-176F-C9A903E27BC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061}
@@ -60,6 +63,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLES
 	ProjectSection(ProjectDependencies) = postProject
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5}
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
+		{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
 		{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
 	EndProjectSection
 EndProject
@@ -150,6 +154,10 @@ Global
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Debug|Win32.Build.0 = Debug|Win32
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Release|Win32.ActiveCfg = Release|Win32
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Release|Win32.Build.0 = Release|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Debug|Win32.ActiveCfg = Debug|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Debug|Win32.Build.0 = Debug|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Release|Win32.ActiveCfg = Release|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Release|Win32.Build.0 = Release|Win32
 		{293E74D1-544C-D368-02A0-52F61A4D0679}.Debug|Win32.ActiveCfg = Debug|Win32
 		{293E74D1-544C-D368-02A0-52F61A4D0679}.Debug|Win32.Build.0 = Debug|Win32
 		{293E74D1-544C-D368-02A0-52F61A4D0679}.Release|Win32.ActiveCfg = Release|Win32

--- a/projects/samples/samples.sln
+++ b/projects/samples/samples.sln
@@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "..\src\commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "..\src\copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es_util", "es_util.vcxproj", "{80E5C3D9-93C2-943E-176F-C9A903E27BC9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FBAEE4F6-562A-588F-01F9-72DCABB3B061} = {FBAEE4F6-562A-588F-01F9-72DCABB3B061}
@@ -37,6 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLES
 	ProjectSection(ProjectDependencies) = postProject
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5}
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
+		{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
 		{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
 	EndProjectSection
 EndProject
@@ -125,6 +128,10 @@ Global
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Debug|Win32.Build.0 = Debug|Win32
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Release|Win32.ActiveCfg = Release|Win32
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Release|Win32.Build.0 = Release|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Debug|Win32.ActiveCfg = Debug|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Debug|Win32.Build.0 = Debug|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Release|Win32.ActiveCfg = Release|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Release|Win32.Build.0 = Release|Win32
 		{293E74D1-544C-D368-02A0-52F61A4D0679}.Debug|Win32.ActiveCfg = Debug|Win32
 		{293E74D1-544C-D368-02A0-52F61A4D0679}.Debug|Win32.Build.0 = Debug|Win32
 		{293E74D1-544C-D368-02A0-52F61A4D0679}.Release|Win32.ActiveCfg = Release|Win32

--- a/projects/src/angle.sln
+++ b/projects/src/angle.sln
@@ -2,6 +2,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "commit_id", "commit_id.vcxproj", "{3B7F5656-177F-52EE-26B3-D6A75368D0A9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "copy_compiler_dll", "copy_compiler_dll.vcxproj", "{22DC02D5-1598-943C-13E1-82185B469F81}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", "{FBAEE4F6-562A-588F-01F9-72DCABB3B061}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
@@ -12,6 +14,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxp
 	ProjectSection(ProjectDependencies) = postProject
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5}
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
+		{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
 		{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
 	EndProjectSection
 EndProject
@@ -31,6 +34,10 @@ Global
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Debug|Win32.Build.0 = Debug|Win32
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Release|Win32.ActiveCfg = Release|Win32
 		{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}.Release|Win32.Build.0 = Release|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Debug|Win32.ActiveCfg = Debug|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Debug|Win32.Build.0 = Debug|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Release|Win32.ActiveCfg = Release|Win32
+		{22DC02D5-1598-943C-13E1-82185B469F81}.Release|Win32.Build.0 = Release|Win32
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9}.Debug|Win32.Build.0 = Debug|Win32
 		{3B7F5656-177F-52EE-26B3-D6A75368D0A9}.Release|Win32.ActiveCfg = Release|Win32

--- a/projects/src/copy_compiler_dll.vcxproj
+++ b/projects/src/copy_compiler_dll.vcxproj
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{22DC02D5-1598-943C-13E1-82185B469F81}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>copy_compiler_dll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
+  <PropertyGroup Label="Configuration">
+    <CharacterSet>Unicode</CharacterSet>
+    <ConfigurationType>Utility</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
+  <ImportGroup Label="ExtensionSettings"/>
+  <ImportGroup Label="PropertySheets">
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros"/>
+  <PropertyGroup>
+    <ExecutablePath>$(ExecutablePath);$(MSBuildProjectDirectory)\..\..\third_party\cygwin\bin\;$(MSBuildProjectDirectory)\..\..\third_party\python_26\</ExecutablePath>
+    <OutDir>$(SolutionDir)$(Configuration)_$(Platform)\</OutDir>
+    <IntDir>$(OutDir)obj\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <TargetName>$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4530;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <MinimalRebuild>false</MinimalRebuild>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WIN32_WINNT=0x0600;_WINDOWS;NOMINMAX;WIN32;WIN32_LEAN_AND_MEAN;WINVER=0x0600;_DEBUG;ANGLE_DISABLE_TRACE;ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link>
+      <AdditionalDependencies>kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Culture>0x0409</Culture>
+      <PreprocessorDefinitions>ANGLE_DISABLE_TRACE;ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100;4127;4189;4239;4244;4245;4512;4702;4530;4718;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <MinimalRebuild>false</MinimalRebuild>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WIN32_WINNT=0x0600;_WINDOWS;NOMINMAX;WIN32;WIN32_LEAN_AND_MEAN;WINVER=0x0600;NDEBUG;ANGLE_DISABLE_TRACE;ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <WarningLevel>Level4</WarningLevel>
+    </ClCompile>
+    <Lib>
+      <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link>
+      <AdditionalDependencies>kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib</AdditionalDependencies>
+      <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <FixedBaseAddress>false</FixedBaseAddress>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>
+      <MapFileName>$(OutDir)$(TargetName).map</MapFileName>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Culture>0x0409</Culture>
+      <PreprocessorDefinitions>ANGLE_DISABLE_TRACE;ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\..\src\angle.gyp"/>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\src\copy_compiler_dll.bat">
+      <FileType>Document</FileType>
+      <Command>call call ..\..\src\copy_compiler_dll.bat &quot;$(Platform)&quot; &quot;C:\Program Files (x86)\Windows Kits\8.0&quot; &quot;$(OutDir)&quot;</Command>
+      <Message>Copying D3D Compiler DLL...</Message>
+      <Outputs>$(OutDir)\D3DCompiler_46.dll</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
+  <ImportGroup Label="ExtensionTargets"/>
+</Project>
--- a/projects/src/copy_compiler_dll.vcxproj.filters
+++ b/projects/src/copy_compiler_dll.vcxproj.filters
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\..">
+      <UniqueIdentifier>{739DB09A-CC57-A953-A6CF-F64FA08E4FA7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\..\src">
+      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="..\..\src\_excluded_files">
+      <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\src\angle.gyp">
+      <Filter>..\..\src</Filter>
+    </None>
+    <None Include="..\..\src\copy_compiler_dll.bat">
+      <Filter>..\..\src\_excluded_files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
--- a/projects/src/libEGL.vcxproj
+++ b/projects/src/libEGL.vcxproj
@@ -124,8 +124,9 @@
    <ClInclude Include="..\..\src\common\event_tracer.h"/>
    <ClInclude Include="..\..\src\common\RefCountObject.h"/>
    <ClInclude Include="..\..\src\common\version.h"/>
-    <ClInclude Include="..\..\src\common\system.h"/>
    <ClInclude Include="..\..\src\common\utilities.h"/>
+    <ClInclude Include="..\..\src\common\system.h"/>
+    <ClInclude Include="..\..\src\common\commit.h"/>
    <ClInclude Include="..\..\src\common\debug.h"/>
    <ClInclude Include="..\..\src\common\angleutils.h"/>
  </ItemGroup>

--- a/projects/src/libEGL.vcxproj.filters
+++ b/projects/src/libEGL.vcxproj.filters
@@ -69,12 +69,15 @@
    <ClInclude Include="..\..\src\common\version.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\system.h">
+    <ClInclude Include="..\..\src\common\utilities.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\common\event_tracer.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\common\system.h">
+      <Filter>..\..\src\common</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\common\RefCountObject.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
@@ -84,7 +87,7 @@
    <ClCompile Include="..\..\src\common\utilities.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\common\utilities.h">
+    <ClInclude Include="..\..\src\common\commit.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\common\debug.h">

--- a/projects/src/libGLESv2.vcxproj
+++ b/projects/src/libGLESv2.vcxproj
@@ -270,10 +270,11 @@
    <ClInclude Include="..\..\src\common\RefCountObject.h"/>
    <ClInclude Include="..\..\src\common\mathutil.h"/>
    <ClInclude Include="..\..\src\common\event_tracer.h"/>
+    <ClInclude Include="..\..\src\common\commit.h"/>
    <ClInclude Include="..\..\src\common\debug.h"/>
    <ClInclude Include="..\..\src\common\version.h"/>
-    <ClInclude Include="..\..\src\common\utilities.h"/>
    <ClInclude Include="..\..\src\common\system.h"/>
+    <ClInclude Include="..\..\src\common\utilities.h"/>
    <ClInclude Include="..\..\src\common\angleutils.h"/>
    <ClInclude Include="..\..\src\third_party\murmurhash\MurmurHash3.h"/>
  </ItemGroup>
@@ -359,14 +360,6 @@
    <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc"/>
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="..\..\src\copy_compiler_dll.bat">
-      <FileType>Document</FileType>
-      <Command>call call copy_compiler_dll.bat &quot;$(Platform)&quot; &quot;C:\Program Files (x86)\Windows Kits\8.0&quot; &quot;$(OutDir)&quot;</Command>
-      <Message>Copying D3D Compiler DLL...</Message>
-      <Outputs>$(OutDir)\D3DCompiler_46.dll</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
    <ProjectReference Include="translator_static.vcxproj">
      <Project>{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -375,6 +368,10 @@
      <Project>{3B7F5656-177F-52EE-26B3-D6A75368D0A9}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    </ProjectReference>
+    <ProjectReference Include="copy_compiler_dll.vcxproj">
+      <Project>{22DC02D5-1598-943C-13E1-82185B469F81}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
    <ProjectReference Include="preprocessor.vcxproj">
      <Project>{C7BAF548-697D-2DCB-9DF3-9D1506A7B444}</Project>
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

--- a/projects/src/libGLESv2.vcxproj.filters
+++ b/projects/src/libGLESv2.vcxproj.filters
@@ -10,9 +10,6 @@
    <Filter Include="..\..\src">
      <UniqueIdentifier>{8CDEE807-BC53-E450-C8B8-4DEBB66742D4}</UniqueIdentifier>
    </Filter>
-    <Filter Include="..\..\src\_excluded_files">
-      <UniqueIdentifier>{158E591E-B6EA-0C85-8F5A-18EAFA09B4CE}</UniqueIdentifier>
-    </Filter>
    <Filter Include="..\..\src\libGLESv2">
      <UniqueIdentifier>{A62A9415-2E9D-A6D2-631D-1F25A5CD626F}</UniqueIdentifier>
    </Filter>
@@ -51,9 +48,6 @@
    <None Include="..\..\src\angle.gyp">
      <Filter>..\..\src</Filter>
    </None>
-    <None Include="..\..\src\copy_compiler_dll.bat">
-      <Filter>..\..\src\_excluded_files</Filter>
-    </None>
    <ClInclude Include="..\..\src\libGLESv2\resource.h">
      <Filter>..\..\src\libGLESv2</Filter>
    </ClInclude>
@@ -738,6 +732,9 @@
    <ClCompile Include="..\..\src\common\event_tracer.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\common\commit.h">
+      <Filter>..\..\src\common</Filter>
+    </ClInclude>
    <ClCompile Include="..\..\src\common\RefCountObject.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
@@ -756,10 +753,10 @@
    <ClInclude Include="..\..\src\common\version.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\utilities.h">
+    <ClInclude Include="..\..\src\common\system.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\common\system.h">
+    <ClInclude Include="..\..\src\common\utilities.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\common\angleutils.h">

--- a/projects/src/translator.vcxproj
+++ b/projects/src/translator.vcxproj
@@ -120,6 +120,7 @@
    <ClInclude Include="..\..\src\common\RefCountObject.h"/>
    <ClInclude Include="..\..\src\common\mathutil.h"/>
    <ClInclude Include="..\..\src\common\event_tracer.h"/>
+    <ClInclude Include="..\..\src\common\commit.h"/>
    <ClInclude Include="..\..\src\common\system.h"/>
    <ClInclude Include="..\..\src\common\debug.h"/>
    <ClInclude Include="..\..\src\common\version.h"/>
@@ -133,7 +134,6 @@
    <ClInclude Include="..\..\src\compiler\translator\FlagStd140Structs.h"/>
    <ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h"/>
    <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h"/>
-    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"/>
    <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h"/>
    <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/>
    <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"/>
@@ -161,6 +161,7 @@
    <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"/>
    <ClInclude Include="..\..\src\compiler\translator\Pragma.h"/>
    <ClInclude Include="..\..\src\compiler\translator\intermediate.h"/>
+    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
    <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h"/>
    <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
    <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/>
@@ -175,7 +176,7 @@
    <ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h"/>
    <ClInclude Include="..\..\src\compiler\translator\MMap.h"/>
    <ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h"/>
-    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
+    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"/>
    <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/>
    <ClInclude Include="..\..\src\compiler\translator\glslang_tab.h"/>
    <ClInclude Include="..\..\src\compiler\translator\ExtensionBehavior.h"/>

--- a/projects/src/translator.vcxproj.filters
+++ b/projects/src/translator.vcxproj.filters
@@ -57,6 +57,9 @@
    <ClCompile Include="..\..\src\common\event_tracer.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\common\commit.h">
+      <Filter>..\..\src\common</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\common\system.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
@@ -135,9 +138,6 @@
    <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
-      <Filter>..\..\src\compiler\translator</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
@@ -264,6 +264,9 @@
    <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
+      <Filter>..\..\src\compiler\translator</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
@@ -351,7 +354,7 @@
    <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
+    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp">

--- a/projects/src/translator_static.vcxproj
+++ b/projects/src/translator_static.vcxproj
@@ -120,6 +120,7 @@
    <ClInclude Include="..\..\src\common\RefCountObject.h"/>
    <ClInclude Include="..\..\src\common\mathutil.h"/>
    <ClInclude Include="..\..\src\common\event_tracer.h"/>
+    <ClInclude Include="..\..\src\common\commit.h"/>
    <ClInclude Include="..\..\src\common\system.h"/>
    <ClInclude Include="..\..\src\common\debug.h"/>
    <ClInclude Include="..\..\src\common\version.h"/>
@@ -133,7 +134,6 @@
    <ClInclude Include="..\..\src\compiler\translator\FlagStd140Structs.h"/>
    <ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h"/>
    <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h"/>
-    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"/>
    <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h"/>
    <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/>
    <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"/>
@@ -161,6 +161,7 @@
    <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"/>
    <ClInclude Include="..\..\src\compiler\translator\Pragma.h"/>
    <ClInclude Include="..\..\src\compiler\translator\intermediate.h"/>
+    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
    <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h"/>
    <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
    <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/>
@@ -175,7 +176,7 @@
    <ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h"/>
    <ClInclude Include="..\..\src\compiler\translator\MMap.h"/>
    <ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h"/>
-    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
+    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"/>
    <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/>
    <ClInclude Include="..\..\src\compiler\translator\glslang_tab.h"/>
    <ClInclude Include="..\..\src\compiler\translator\ExtensionBehavior.h"/>

--- a/projects/src/translator_static.vcxproj.filters
+++ b/projects/src/translator_static.vcxproj.filters
@@ -57,6 +57,9 @@
    <ClCompile Include="..\..\src\common\event_tracer.cpp">
      <Filter>..\..\src\common</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\common\commit.h">
+      <Filter>..\..\src\common</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\common\system.h">
      <Filter>..\..\src\common</Filter>
    </ClInclude>
@@ -135,9 +138,6 @@
    <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
-      <Filter>..\..\src\compiler\translator</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
@@ -264,6 +264,9 @@
    <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClCompile>
+    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
+      <Filter>..\..\src\compiler\translator</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
@@ -351,7 +354,7 @@
    <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClCompile>
-    <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
+    <ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
      <Filter>..\..\src\compiler\translator</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp">

--- a/src/angle.gypi
+++ b/src/angle.gypi
@@ -39,7 +39,23 @@
                                'action': ['<(angle_relative_src_path)commit_id.bat'],
                            }
                        ] #actions
-                    }
+                    },
+                    {
+                        'target_name': 'copy_compiler_dll',
+                        'type': 'none',
+                        'sources': [ 'copy_compiler_dll.bat' ],
+                        'actions':
+                        [
+                            {
+                                'msvs_cygwin_shell': 0,
+                                'action_name': 'copy_dll',
+                                'message': 'Copying D3D Compiler DLL...',
+                                'inputs': [ 'copy_compiler_dll.bat' ],
+                                'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
+                                'action': ["<(angle_relative_src_path)copy_compiler_dll.bat", "$(PlatformName)", "<(windows_sdk_path)", "<(PRODUCT_DIR)" ],
+                            }
+                        ] #actions
+                    },
                ] # targets
            },
        ],

--- a/src/copy_compiler_dll.bat
+++ b/src/copy_compiler_dll.bat
 @echo off
 set _arch=%1
 set _arch=%_arch:Win32=x86%
-set _arch=%_arch:"=%
+copy %2"\Redist\D3D\"%_arch%"\d3dcompiler_46.dll" %3 > NUL
-set _sdkdir=%2
-set _sdkdir=%_sdkdir:"=%
-copy "%_sdkdir%\Redist\D3D\%_arch%\d3dcompiler_46.dll" %3
--- a/src/libGLESv2.gypi
+++ b/src/libGLESv2.gypi
@@ -22,7 +22,7 @@
                {
                    'target_name': 'libGLESv2',
                    'type': 'shared_library',
-                    'dependencies': [ 'translator_static', 'commit_id' ],
+                    'dependencies': [ 'translator_static', 'commit_id', 'copy_compiler_dll' ],
                    'include_dirs':
                    [
                        '.',
@@ -47,17 +47,6 @@
                            ]
                        }
                    },
-                    'actions':
-                    [
-                        {
-                            'msvs_cygwin_shell': 0,
-                            'action_name': 'copy_dll',
-                            'message': 'Copying D3D Compiler DLL...',
-                            'inputs': [ 'copy_compiler_dll.bat' ],
-                            'outputs': [ '<(PRODUCT_DIR)/D3DCompiler_46.dll' ],
-                            'action': ["copy_compiler_dll.bat", "$(PlatformName)", "<(windows_sdk_path)", "<(PRODUCT_DIR)" ],
-                        }
-                    ] #actions
                },
            ],
        },