[webkit-changes] [164575] trunk/Source/ThirdParty/ANGLE

Sun, 23 Feb 2014 18:19:19 -0800

Title: [164575] trunk/Source/ThirdParty/ANGLE
Revision
164575
Author
[email protected]
Date
2014-02-23 18:24:36 -0800 (Sun, 23 Feb 2014)

Log Message

[WinCairo] Unreviewed build fix after r164565.

* ANGLE.vcxproj/libEGL.vcxproj: Use correct path to files.
* ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
* ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
* ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
* ANGLE.vcxproj/translator_common.vcxproj: Ditto.
* ANGLE.vcxproj/translator_common.vcxproj.filters: Ditto.
* ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
* ANGLE.vcxproj/translator_glsl.vcxproj.filters: Ditto.
* ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
* ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Ditto.

Modified Paths

Diff

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj	2014-02-24 02:24:36 UTC (rev 164575)
@@ -84,7 +84,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj	2014-02-24 02:24:36 UTC (rev 164575)
@@ -80,7 +80,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
     <ConfigurationType>DynamicLibrary</ConfigurationType>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj.filters	2014-02-24 02:24:36 UTC (rev 164575)
@@ -185,9 +185,6 @@
     <ClCompile Include="..\src\libGLESv2\renderer\d3d9\renderer9_utils.cpp">
       <Filter>Source Files\Renderer9</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\libGLESv2\renderer\d3d9\RenderTarget9.cpp">
-      <Filter>Source Files\Renderer9</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\libGLESv2\renderer\d3d9\ShaderExecutable9.cpp">
       <Filter>Source Files\Renderer9</Filter>
     </ClCompile>
@@ -200,18 +197,6 @@
     <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexBuffer9.cpp">
       <Filter>Source Files\Renderer9</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\libGLESv2\renderer\d3d9\Blit.cpp">
-      <Filter>Source Files\Renderer9</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.cpp">
-      <Filter>Source Files\Renderer11</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.cpp">
-      <Filter>Source Files\Renderer11</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\libGLESv2\renderer\d3d9\VertexDeclarationCache.cpp">
-      <Filter>Source Files\Renderer9</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\libGLESv2\precompiled.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -224,6 +209,21 @@
     <ClCompile Include="..\src\common\event_tracer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\libGLESv2\renderer\Blit.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libGLESv2\renderer\InputLayoutCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libGLESv2\renderer\RenderTarget9.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libGLESv2\renderer\RenderStateCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libGLESv2\renderer\VertexDeclarationCache.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\libGLESv2\BinaryStream.h">
@@ -385,9 +385,6 @@
     <ClInclude Include="..\src\libGLESv2\renderer\VertexBuffer.h">
       <Filter>Header Files\Renderer</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\libGLESv2\renderer\vertexconversion.h">
-      <Filter>Header Files\Renderer</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\libGLESv2\renderer\VertexDataManager.h">
       <Filter>Header Files\Renderer</Filter>
     </ClInclude>
@@ -469,18 +466,6 @@
     <ClInclude Include="..\src\libGLESv2\renderer\d3d11\Query11.h">
       <Filter>Header Files\Renderer\Renderer11</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\libGLESv2\renderer\d3d9\Blit.h">
-      <Filter>Header Files\Renderer9</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\libGLESv2\renderer\d3d9\ShaderCache.h">
-      <Filter>Header Files\Renderer9</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\libGLESv2\renderer\d3d11\InputLayoutCache.h">
-      <Filter>Header Files\Renderer11</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\libGLESv2\renderer\d3d11\RenderStateCache.h">
-      <Filter>Header Files\Renderer11</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\libGLESv2\renderer\VertexDeclarationCache.h">
       <Filter>Header Files\Renderer9</Filter>
     </ClInclude>
@@ -496,17 +481,23 @@
     <ClInclude Include="..\src\common\event_tracer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\libGLESv2\renderer\Blit.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libGLESv2\renderer\InputLayoutCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libGLESv2\renderer\RenderStateCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libGLESv2\renderer\ShaderCache.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libGLESv2\renderer\d3d9\vertexconversion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\src\libGLESv2\renderer\shaders\Blit.ps">
-      <Filter>Shaders</Filter>
-    </None>
-    <None Include="..\src\libGLESv2\renderer\shaders\Blit.vs">
-      <Filter>Shaders</Filter>
-    </None>
-    <None Include="..\src\libGLESv2\renderer\shaders\generate_shaders.bat">
-      <Filter>Shaders</Filter>
-    </None>
     <None Include="..\src\libGLESv2\renderer\d3d11\shaders\Passthrough11.hlsl">
       <Filter>Shaders</Filter>
     </None>
@@ -514,6 +505,11 @@
       <Filter>Shaders</Filter>
     </None>
     <None Include="..\src\libGLESv2\libGLESv2.def" />
+    <None Include="..\src\libGLESv2\renderer\d3d9\shaders\Blit.ps" />
+    <None Include="..\src\libGLESv2\renderer\d3d9\shaders\Blit.vs" />
+    <None Include="..\src\libGLESv2\renderer\d3d9\shaders\generate_shaders.bat">
+      <Filter>Source Files</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\src\libGLESv2\libGLESv2.rc" />

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj	2014-02-24 02:24:36 UTC (rev 164575)
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj	2014-02-24 02:24:36 UTC (rev 164575)
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj.filters	2014-02-24 02:24:36 UTC (rev 164575)
@@ -149,6 +149,9 @@
     <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuitAST.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\compiler\translator\RewriteElseBlocks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\compiler\translator\glslang_tab.h">
@@ -280,6 +283,9 @@
     <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuitAST.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\compiler\translator\RewriteElseBlocks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\src\compiler\translator\glslang.l">

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj	2014-02-24 02:24:36 UTC (rev 164575)
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -139,30 +139,30 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />
-    <ClCompile Include="..\src\compiler\OutputESSL.cpp" />
-    <ClCompile Include="..\src\compiler\OutputGLSL.cpp" />
-    <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp" />
-    <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />
-    <ClCompile Include="..\src\compiler\TranslatorESSL.cpp" />
-    <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp" />
-    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />
-    <ClCompile Include="..\src\compiler\Uniform.cpp" />
-    <ClCompile Include="..\src\compiler\VersionGLSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp" />
+    <ClCompile Include="..\src\compiler\translator\OutputESSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\OutputGLSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\OutputGLSLBase.cpp" />
+    <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp" />
+    <ClCompile Include="..\src\compiler\translator\TranslatorESSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\TranslatorGLSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp" />
+    <ClCompile Include="..\src\compiler\translator\Uniform.cpp" />
+    <ClCompile Include="..\src\compiler\translator\VersionGLSL.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />
-    <ClInclude Include="..\src\compiler\OutputESSL.h" />
-    <ClInclude Include="..\src\compiler\OutputGLSL.h" />
-    <ClInclude Include="..\src\compiler\OutputGLSLBase.h" />
-    <ClInclude Include="..\src\compiler\SearchSymbol.h" />
-    <ClInclude Include="..\src\compiler\TranslatorESSL.h" />
-    <ClInclude Include="..\src\compiler\TranslatorGLSL.h" />
-    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />
-    <ClInclude Include="..\src\compiler\Uniform.h" />
-    <ClInclude Include="..\src\compiler\VersionGLSL.h" />
+    <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h" />
+    <ClInclude Include="..\src\compiler\translator\OutputESSL.h" />
+    <ClInclude Include="..\src\compiler\translator\OutputGLSL.h" />
+    <ClInclude Include="..\src\compiler\translator\OutputGLSLBase.h" />
+    <ClInclude Include="..\src\compiler\translator\SearchSymbol.h" />
+    <ClInclude Include="..\src\compiler\translator\TranslatorESSL.h" />
+    <ClInclude Include="..\src\compiler\translator\TranslatorGLSL.h" />
+    <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h" />
+    <ClInclude Include="..\src\compiler\translator\Uniform.h" />
+    <ClInclude Include="..\src\compiler\translator\VersionGLSL.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj.filters	2014-02-24 02:24:36 UTC (rev 164575)
@@ -11,67 +11,67 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\compiler\VersionGLSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\VersionGLSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">
+    <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\OutputESSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\OutputESSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\OutputGLSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\OutputGLSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\OutputGLSLBase.cpp">
+    <ClCompile Include="..\src\compiler\translator\OutputGLSLBase.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\SearchSymbol.cpp">
+    <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\TranslatorESSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\TranslatorESSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\TranslatorGLSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\TranslatorGLSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">
+    <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\Uniform.cpp">
+    <ClCompile Include="..\src\compiler\translator\Uniform.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">
+    <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\VersionGLSL.h">
+    <ClInclude Include="..\src\compiler\translator\VersionGLSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\OutputESSL.h">
+    <ClInclude Include="..\src\compiler\translator\OutputESSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\OutputGLSL.h">
+    <ClInclude Include="..\src\compiler\translator\OutputGLSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\OutputGLSLBase.h">
+    <ClInclude Include="..\src\compiler\translator\OutputGLSLBase.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\SearchSymbol.h">
+    <ClInclude Include="..\src\compiler\translator\SearchSymbol.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\TranslatorESSL.h">
+    <ClInclude Include="..\src\compiler\translator\TranslatorESSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\TranslatorGLSL.h">
+    <ClInclude Include="..\src\compiler\translator\TranslatorGLSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">
+    <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\Uniform.h">
+    <ClInclude Include="..\src\compiler\translator\Uniform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj	2014-02-24 02:24:36 UTC (rev 164575)
@@ -70,7 +70,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -139,22 +139,22 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
-    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp" />
-    <ClCompile Include="..\src\compiler\OutputHLSL.cpp" />
-    <ClCompile Include="..\src\compiler\SearchSymbol.cpp" />
-    <ClCompile Include="..\src\compiler\TranslatorHLSL.cpp" />
-    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp" />
-    <ClCompile Include="..\src\compiler\Uniform.cpp" />
+    <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp" />
+    <ClCompile Include="..\src\compiler\translator\OutputHLSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp" />
+    <ClCompile Include="..\src\compiler\translator\TranslatorHLSL.cpp" />
+    <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp" />
+    <ClCompile Include="..\src\compiler\translator\Uniform.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h" />
-    <ClInclude Include="..\src\compiler\OutputHLSL.h" />
-    <ClInclude Include="..\src\compiler\SearchSymbol.h" />
-    <ClInclude Include="..\src\compiler\TranslatorHLSL.h" />
-    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h" />
-    <ClInclude Include="..\src\compiler\Uniform.h" />
+    <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h" />
+    <ClInclude Include="..\src\compiler\translator\OutputHLSL.h" />
+    <ClInclude Include="..\src\compiler\translator\SearchSymbol.h" />
+    <ClInclude Include="..\src\compiler\translator\TranslatorHLSL.h" />
+    <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h" />
+    <ClInclude Include="..\src\compiler\translator\Uniform.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj.filters	2014-02-24 02:24:36 UTC (rev 164575)
@@ -11,43 +11,43 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\compiler\DetectDiscontinuity.cpp">
+    <ClCompile Include="..\src\compiler\translator\DetectDiscontinuity.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\SearchSymbol.cpp">
+    <ClCompile Include="..\src\compiler\translator\SearchSymbol.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\UnfoldShortCircuit.cpp">
+    <ClCompile Include="..\src\compiler\translator\UnfoldShortCircuit.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\Uniform.cpp">
+    <ClCompile Include="..\src\compiler\translator\Uniform.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\OutputHLSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\OutputHLSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\compiler\TranslatorHLSL.cpp">
+    <ClCompile Include="..\src\compiler\translator\TranslatorHLSL.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\compiler\DetectDiscontinuity.h">
+    <ClInclude Include="..\src\compiler\translator\DetectDiscontinuity.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\SearchSymbol.h">
+    <ClInclude Include="..\src\compiler\translator\SearchSymbol.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\UnfoldShortCircuit.h">
+    <ClInclude Include="..\src\compiler\translator\UnfoldShortCircuit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\Uniform.h">
+    <ClInclude Include="..\src\compiler\translator\Uniform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\OutputHLSL.h">
+    <ClInclude Include="..\src\compiler\translator\OutputHLSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\compiler\TranslatorHLSL.h">
+    <ClInclude Include="..\src\compiler\translator\TranslatorHLSL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (164574 => 164575)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2014-02-24 02:11:36 UTC (rev 164574)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2014-02-24 02:24:36 UTC (rev 164575)
@@ -1,3 +1,18 @@
+2014-02-23  Brent Fulgham  <[email protected]>
+
+        [WinCairo] Unreviewed build fix after r164565.
+
+        * ANGLE.vcxproj/libEGL.vcxproj: Use correct path to files.
+        * ANGLE.vcxproj/libGLESv2.vcxproj: Ditto.
+        * ANGLE.vcxproj/libGLESv2.vcxproj.filters: Ditto.
+        * ANGLE.vcxproj/preprocessor.vcxproj: Ditto.
+        * ANGLE.vcxproj/translator_common.vcxproj: Ditto.
+        * ANGLE.vcxproj/translator_common.vcxproj.filters: Ditto.
+        * ANGLE.vcxproj/translator_glsl.vcxproj: Ditto.
+        * ANGLE.vcxproj/translator_glsl.vcxproj.filters: Ditto.
+        * ANGLE.vcxproj/translator_hlsl.vcxproj: Ditto.
+        * ANGLE.vcxproj/translator_hlsl.vcxproj.filters: Ditto.
+
 2014-02-23  Dean Jackson  <[email protected]>
 
         Missing files from previous commit.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to