Skip to content

A
angle
Commit e688e651 by shannon.woods@transgaming.com
Options

Remove the ResourceLimits.h reference, which was causing the translator_common to always rebuild.

Also tinker with the deps a bit to allow for more parallelism during the build process. TRAC #22437 Signed-off-by: Nicolas Capens Signed-off-by: Daniel Koch Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1754 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 4526236b
Showing with 20 additions and 31 deletions
samples/translator/essl_to_hlsl.vcxproj
...@@ -91,6 +91,12 @@ ...@@ -91,6 +91,12 @@
<ClCompile Include="translator.cpp" /> <ClCompile Include="translator.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\src\compiler\preprocessor\preprocessor.vcxproj">
<Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
</ProjectReference>
<ProjectReference Include="..\..\src\compiler\translator_common.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
</ProjectReference>
<ProjectReference Include="..\..\src\compiler\translator_hlsl.vcxproj"> <ProjectReference Include="..\..\src\compiler\translator_hlsl.vcxproj">
<Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project> <Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
src/compiler/translator_common.vcxproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
...@@ -252,7 +252,6 @@ ...@@ -252,7 +252,6 @@
<ClInclude Include="QualifierAlive.h" /> <ClInclude Include="QualifierAlive.h" />
<ClInclude Include="RemoveTree.h" /> <ClInclude Include="RemoveTree.h" />
<ClInclude Include="RenameFunction.h" /> <ClInclude Include="RenameFunction.h" />
<ClInclude Include="..\..\include\GLSLANG\ResourceLimits.h" />
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h" /> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h" />
<ClInclude Include="ShHandle.h" /> <ClInclude Include="ShHandle.h" />
<ClInclude Include="SymbolTable.h" /> <ClInclude Include="SymbolTable.h" />
...@@ -268,16 +267,6 @@ ...@@ -268,16 +267,6 @@
<ClInclude Include="depgraph\DependencyGraphBuilder.h" /> <ClInclude Include="depgraph\DependencyGraphBuilder.h" />
<ClInclude Include="depgraph\DependencyGraphOutput.h" /> <ClInclude Include="depgraph\DependencyGraphOutput.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="preprocessor\preprocessor.vcxproj">
<Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Private>true</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
......
src/compiler/translator_common.vcxproj.filters
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
...@@ -134,6 +134,9 @@ ...@@ -134,6 +134,9 @@
<ClCompile Include="timing\RestrictVertexShaderTiming.cpp"> <ClCompile Include="timing\RestrictVertexShaderTiming.cpp">
<Filter>Source Files\timing</Filter> <Filter>Source Files\timing</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="ArrayBoundsClamper.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="BaseTypes.h"> <ClInclude Include="BaseTypes.h">
...@@ -208,9 +211,6 @@ ...@@ -208,9 +211,6 @@
<ClInclude Include="RenameFunction.h"> <ClInclude Include="RenameFunction.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\include\GLSLANG\ResourceLimits.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\GLSLANG\ShaderLang.h"> <ClInclude Include="..\..\include\GLSLANG\ShaderLang.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -256,6 +256,9 @@ ...@@ -256,6 +256,9 @@
<ClInclude Include="HashNames.h"> <ClInclude Include="HashNames.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ArrayBoundsClamper.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="glslang.l"> <CustomBuild Include="glslang.l">
......
src/compiler/translator_hlsl.vcxproj
...@@ -158,16 +158,6 @@ ...@@ -158,16 +158,6 @@
<ClInclude Include="UnfoldShortCircuit.h" /> <ClInclude Include="UnfoldShortCircuit.h" />
<ClInclude Include="Uniform.h" /> <ClInclude Include="Uniform.h" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="translator_common.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Private>true</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
......
src/libEGL/libEGL.vcxproj
...@@ -253,11 +253,6 @@ copy "$(OutDir)libEGL.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -253,11 +253,6 @@ copy "$(OutDir)libEGL.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\libGLESv2\libGLESv2.vcxproj"> <ProjectReference Include="..\libGLESv2\libGLESv2.vcxproj">
<Project>{b5871a7a-968c-42e3-a33b-981e6f448e78}</Project> <Project>{b5871a7a-968c-42e3-a33b-981e6f448e78}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<Private>true</Private>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
src/libGLESv2/libGLESv2.vcxproj
...@@ -362,6 +362,12 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\" ...@@ -362,6 +362,12 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
<ResourceCompile Include="libGLESv2.rc" /> <ResourceCompile Include="libGLESv2.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\compiler\preprocessor\preprocessor.vcxproj">
<Project>{fbe32df3-0fb0-4f2f-a424-2c21bd7bc325}</Project>
</ProjectReference>
<ProjectReference Include="..\compiler\translator_common.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
</ProjectReference>
<ProjectReference Include="..\compiler\translator_hlsl.vcxproj"> <ProjectReference Include="..\compiler\translator_hlsl.vcxproj">
<Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project> <Project>{5620f0e4-6c43-49bc-a178-b804e1a0c3a7}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment