Skip to content

A
angle
Commit 0aa84f63 by Jamie Madill
Options

Merge 'Tie program binary version to commit hash.'

Port changes from master branch with commit hash embedding to the development branch. BUG=angle:529 Change-Id: I307bf44103913aaaeb875a2e3ade1fab77838c48 Reviewed-on: https://chromium-review.googlesource.com/186390Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 5f6937ca
Showing with 96 additions and 101 deletions
.gitignore
...@@ -32,5 +32,4 @@ third_party ...@@ -32,5 +32,4 @@ third_party
tests/third_party tests/third_party
out out
lib/* lib/*
src/common/commit.h
projects/build/all.sln
...@@ -64,7 +64,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx ...@@ -64,7 +64,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
......
projects/samples/samples.sln
...@@ -39,7 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx ...@@ -39,7 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
...@@ -110,6 +110,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_wrap", "texture_wra ...@@ -110,6 +110,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_wrap", "texture_wra
{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81} = {7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "..\src\translator.vcxproj", "{C15697F6-5057-016E-BD29-422971875679}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_static", "..\src\translator_static.vcxproj", "{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_static", "..\src\translator_static.vcxproj", "{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}"
EndProject EndProject
Global Global
...@@ -186,6 +188,10 @@ Global ...@@ -186,6 +188,10 @@ Global
{B4D06330-EED1-6F99-BCA4-2F913908C38A}.Debug|Win32.Build.0 = Debug|Win32 {B4D06330-EED1-6F99-BCA4-2F913908C38A}.Debug|Win32.Build.0 = Debug|Win32
{B4D06330-EED1-6F99-BCA4-2F913908C38A}.Release|Win32.ActiveCfg = Release|Win32 {B4D06330-EED1-6F99-BCA4-2F913908C38A}.Release|Win32.ActiveCfg = Release|Win32
{B4D06330-EED1-6F99-BCA4-2F913908C38A}.Release|Win32.Build.0 = Release|Win32 {B4D06330-EED1-6F99-BCA4-2F913908C38A}.Release|Win32.Build.0 = Release|Win32
{C15697F6-5057-016E-BD29-422971875679}.Debug|Win32.ActiveCfg = Debug|Win32
{C15697F6-5057-016E-BD29-422971875679}.Debug|Win32.Build.0 = Debug|Win32
{C15697F6-5057-016E-BD29-422971875679}.Release|Win32.ActiveCfg = Release|Win32
{C15697F6-5057-016E-BD29-422971875679}.Release|Win32.Build.0 = Release|Win32
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444}.Debug|Win32.ActiveCfg = Debug|Win32 {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}.Debug|Win32.ActiveCfg = Debug|Win32
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444}.Debug|Win32.Build.0 = Debug|Win32 {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}.Debug|Win32.Build.0 = Debug|Win32
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444}.Release|Win32.ActiveCfg = Release|Win32 {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}.Release|Win32.ActiveCfg = Release|Win32
......
projects/src/angle.sln
...@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj", ...@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "libEGL.vcxproj",
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "libGLESv2.vcxproj", "{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{19386E01-D811-FA3B-9F1E-122BB0C0E9F5} = {19386E01-D811-FA3B-9F1E-122BB0C0E9F5} {C15697F6-5057-016E-BD29-422971875679} = {C15697F6-5057-016E-BD29-422971875679}
{3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9} {3B7F5656-177F-52EE-26B3-D6A75368D0A9} = {3B7F5656-177F-52EE-26B3-D6A75368D0A9}
{22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81} {22DC02D5-1598-943C-13E1-82185B469F81} = {22DC02D5-1598-943C-13E1-82185B469F81}
{C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} {C7BAF548-697D-2DCB-9DF3-9D1506A7B444} = {C7BAF548-697D-2DCB-9DF3-9D1506A7B444}
......
projects/src/commit_id.vcxproj
...@@ -111,9 +111,9 @@ ...@@ -111,9 +111,9 @@
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\src\commit_id.bat"> <CustomBuild Include="..\..\src\commit_id.bat">
<FileType>Document</FileType> <FileType>Document</FileType>
<Command>call call ..\..\src\commit_id.bat</Command> <Command>call call ..\..\src\commit_id.bat $(OutDir)obj\global_intermediate</Command>
<Message>Generating commit ID header...</Message> <Message>Generating commit ID header...</Message>
<Outputs>..\..\src\common\commit.h</Outputs> <Outputs>$(OutDir)obj\global_intermediate\commit.h</Outputs>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
......
projects/src/libEGL.vcxproj
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
...@@ -68,14 +68,14 @@ ...@@ -68,14 +68,14 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <Culture>0x0409</Culture>
<PreprocessorDefinitions>ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile> </ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <Culture>0x0409</Culture>
<PreprocessorDefinitions>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> <PreprocessorDefinitions>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> </ResourceCompile>
...@@ -122,7 +122,6 @@ ...@@ -122,7 +122,6 @@
<ClInclude Include="..\..\src\libEGL\Display.h"/> <ClInclude Include="..\..\src\libEGL\Display.h"/>
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\mathutil.h"/> <ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
......
projects/src/libEGL.vcxproj.filters
...@@ -84,9 +84,6 @@ ...@@ -84,9 +84,6 @@
<ClCompile Include="..\..\src\common\debug.cpp"> <ClCompile Include="..\..\src\common\debug.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\common\commit.h">
<Filter>src\common</Filter>
</ClInclude>
<ClInclude Include="..\..\src\common\mathutil.h"> <ClInclude Include="..\..\src\common\mathutil.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
......
projects/src/libGLESv2.vcxproj
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<Optimization>Disabled</Optimization> <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_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> <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_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
...@@ -68,14 +68,14 @@ ...@@ -68,14 +68,14 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <Culture>0x0409</Culture>
<PreprocessorDefinitions>ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_TRANSLATOR_STATIC;ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_ENABLE_PERF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile> </ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<BufferSecurityCheck>true</BufferSecurityCheck> <BufferSecurityCheck>true</BufferSecurityCheck>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<Optimization>MaxSpeed</Optimization> <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_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <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_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> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<ResourceCompile> <ResourceCompile>
<AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\src;..\..\include;..\..\src\libGLESv2;$(OutDir)obj\global_intermediate;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> <Culture>0x0409</Culture>
<PreprocessorDefinitions>ANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT(&quot;d3dcompiler_46.dll&quot;), TEXT(&quot;d3dcompiler_43.dll&quot;) };ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>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> </ResourceCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
...@@ -267,7 +267,6 @@ ...@@ -267,7 +267,6 @@
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\mathutil.h"/> <ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/> <ClInclude Include="..\..\src\common\utilities.h"/>
...@@ -369,8 +368,8 @@ ...@@ -369,8 +368,8 @@
<ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc"/> <ResourceCompile Include="..\..\src\libGLESv2\libGLESv2.rc"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="translator_static.vcxproj"> <ProjectReference Include="translator.vcxproj">
<Project>{19386E01-D811-FA3B-9F1E-122BB0C0E9F5}</Project> <Project>{C15697F6-5057-016E-BD29-422971875679}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="commit_id.vcxproj"> <ProjectReference Include="commit_id.vcxproj">
......
projects/src/libGLESv2.vcxproj.filters
...@@ -741,9 +741,6 @@ ...@@ -741,9 +741,6 @@
<ClCompile Include="..\..\src\common\event_tracer.cpp"> <ClCompile Include="..\..\src\common\event_tracer.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\common\commit.h">
<Filter>src\common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\RefCountObject.cpp"> <ClCompile Include="..\..\src\common\RefCountObject.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
......
projects/src/translator.vcxproj
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\mathutil.h"/> <ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/> <ClInclude Include="..\..\src\common\utilities.h"/>
...@@ -135,6 +134,7 @@ ...@@ -135,6 +134,7 @@
<ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h"/> <ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h"/>
<ClInclude Include="..\..\src\compiler\translator\RewriteElseBlocks.h"/> <ClInclude Include="..\..\src\compiler\translator\RewriteElseBlocks.h"/>
<ClInclude Include="..\..\src\compiler\translator\PoolAlloc.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\BuiltInFunctionEmulator.h"/>
<ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/> <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"/> <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"/>
...@@ -154,15 +154,14 @@ ...@@ -154,15 +154,14 @@
<ClInclude Include="..\..\src\compiler\translator\NodeSearch.h"/> <ClInclude Include="..\..\src\compiler\translator\NodeSearch.h"/>
<ClInclude Include="..\..\src\compiler\translator\TranslatorESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\TranslatorESSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeDll.h"/> <ClInclude Include="..\..\src\compiler\translator\InitializeDll.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeVariables.h"/>
<ClInclude Include="..\..\src\compiler\translator\localintermediate.h"/> <ClInclude Include="..\..\src\compiler\translator\localintermediate.h"/>
<ClInclude Include="..\..\src\compiler\translator\ShHandle.h"/> <ClInclude Include="..\..\src\compiler\translator\ShHandle.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h"/>
<ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"/> <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeGLPosition.h"/>
<ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"/> <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"/>
<ClInclude Include="..\..\src\compiler\translator\Pragma.h"/> <ClInclude Include="..\..\src\compiler\translator\Pragma.h"/>
<ClInclude Include="..\..\src\compiler\translator\intermediate.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\TranslatorHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/> <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/>
...@@ -176,7 +175,7 @@ ...@@ -176,7 +175,7 @@
<ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h"/> <ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h"/>
<ClInclude Include="..\..\src\compiler\translator\MMap.h"/> <ClInclude Include="..\..\src\compiler\translator\MMap.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"/> <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
<ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h"/> <ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h"/>
<ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/> <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/>
<ClInclude Include="..\..\src\compiler\translator\glslang_tab.h"/> <ClInclude Include="..\..\src\compiler\translator\glslang_tab.h"/>
...@@ -217,6 +216,7 @@ ...@@ -217,6 +216,7 @@
<ClCompile Include="..\..\src\compiler\translator\ShaderVariable.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ShaderVariable.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\ParseContext.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ParseContext.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp"/> <ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InitializeVariables.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InitializeDll.cpp"/> <ClCompile Include="..\..\src\compiler\translator\InitializeDll.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\PoolAlloc.cpp"/> <ClCompile Include="..\..\src\compiler\translator\PoolAlloc.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\BlockLayoutEncoder.cpp"/> <ClCompile Include="..\..\src\compiler\translator\BlockLayoutEncoder.cpp"/>
...@@ -228,7 +228,6 @@ ...@@ -228,7 +228,6 @@
<ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\ValidateOutputs.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ValidateOutputs.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\TranslatorESSL.cpp"/> <ClCompile Include="..\..\src\compiler\translator\TranslatorESSL.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InitializeGLPosition.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"/> <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\parseConst.cpp"/> <ClCompile Include="..\..\src\compiler\translator\parseConst.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\VersionGLSL.cpp"/> <ClCompile Include="..\..\src\compiler\translator\VersionGLSL.cpp"/>
......
projects/src/translator.vcxproj.filters
...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
<ClInclude Include="..\..\src\common\event_tracer.h"> <ClInclude Include="..\..\src\common\event_tracer.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\commit.h">
<Filter>src\common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\utilities.cpp"> <ClCompile Include="..\..\src\common\utilities.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
...@@ -153,6 +150,9 @@ ...@@ -153,6 +150,9 @@
<ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h"> <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h"> <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -168,6 +168,9 @@ ...@@ -168,6 +168,9 @@
<ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp"> <ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\compiler\translator\InitializeVariables.cpp">
<Filter>src\compiler\translator</Filter>
</ClCompile>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"> <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -252,9 +255,9 @@ ...@@ -252,9 +255,9 @@
<ClInclude Include="..\..\src\compiler\translator\InitializeDll.h"> <ClInclude Include="..\..\src\compiler\translator\InitializeDll.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\InitializeGLPosition.cpp"> <ClInclude Include="..\..\src\compiler\translator\InitializeVariables.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\localintermediate.h"> <ClInclude Include="..\..\src\compiler\translator\localintermediate.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -267,9 +270,6 @@ ...@@ -267,9 +270,6 @@
<ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"> <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\InitializeGLPosition.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"> <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -282,9 +282,6 @@ ...@@ -282,9 +282,6 @@
<ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"> <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h"> <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -375,7 +372,7 @@ ...@@ -375,7 +372,7 @@
<ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp"> <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"> <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp"> <ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp">
......
projects/src/translator_static.vcxproj
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
<ClInclude Include="..\..\src\common\RefCountObject.h"/> <ClInclude Include="..\..\src\common\RefCountObject.h"/>
<ClInclude Include="..\..\src\common\mathutil.h"/> <ClInclude Include="..\..\src\common\mathutil.h"/>
<ClInclude Include="..\..\src\common\event_tracer.h"/> <ClInclude Include="..\..\src\common\event_tracer.h"/>
<ClInclude Include="..\..\src\common\commit.h"/>
<ClInclude Include="..\..\src\common\debug.h"/> <ClInclude Include="..\..\src\common\debug.h"/>
<ClInclude Include="..\..\src\common\version.h"/> <ClInclude Include="..\..\src\common\version.h"/>
<ClInclude Include="..\..\src\common\utilities.h"/> <ClInclude Include="..\..\src\common\utilities.h"/>
...@@ -135,6 +134,7 @@ ...@@ -135,6 +134,7 @@
<ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h"/> <ClInclude Include="..\..\src\compiler\translator\MapLongVariableNames.h"/>
<ClInclude Include="..\..\src\compiler\translator\RewriteElseBlocks.h"/> <ClInclude Include="..\..\src\compiler\translator\RewriteElseBlocks.h"/>
<ClInclude Include="..\..\src\compiler\translator\PoolAlloc.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\BuiltInFunctionEmulator.h"/>
<ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/> <ClInclude Include="..\..\src\compiler\translator\ValidateOutputs.h"/>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"/> <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"/>
...@@ -154,15 +154,14 @@ ...@@ -154,15 +154,14 @@
<ClInclude Include="..\..\src\compiler\translator\NodeSearch.h"/> <ClInclude Include="..\..\src\compiler\translator\NodeSearch.h"/>
<ClInclude Include="..\..\src\compiler\translator\TranslatorESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\TranslatorESSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeDll.h"/> <ClInclude Include="..\..\src\compiler\translator\InitializeDll.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeVariables.h"/>
<ClInclude Include="..\..\src\compiler\translator\localintermediate.h"/> <ClInclude Include="..\..\src\compiler\translator\localintermediate.h"/>
<ClInclude Include="..\..\src\compiler\translator\ShHandle.h"/> <ClInclude Include="..\..\src\compiler\translator\ShHandle.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputGLSLBase.h"/>
<ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"/> <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"/>
<ClInclude Include="..\..\src\compiler\translator\InitializeGLPosition.h"/>
<ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"/> <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"/>
<ClInclude Include="..\..\src\compiler\translator\Pragma.h"/> <ClInclude Include="..\..\src\compiler\translator\Pragma.h"/>
<ClInclude Include="..\..\src\compiler\translator\intermediate.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\TranslatorHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputESSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/> <ClInclude Include="..\..\src\compiler\translator\RenameFunction.h"/>
...@@ -176,7 +175,7 @@ ...@@ -176,7 +175,7 @@
<ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h"/> <ClInclude Include="..\..\src\compiler\translator\SearchSymbol.h"/>
<ClInclude Include="..\..\src\compiler\translator\MMap.h"/> <ClInclude Include="..\..\src\compiler\translator\MMap.h"/>
<ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h"/> <ClInclude Include="..\..\src\compiler\translator\OutputHLSL.h"/>
<ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"/> <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h"/>
<ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h"/> <ClInclude Include="..\..\src\compiler\translator\BlockLayoutEncoder.h"/>
<ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/> <ClInclude Include="..\..\src\compiler\translator\VariableInfo.h"/>
<ClInclude Include="..\..\src\compiler\translator\glslang_tab.h"/> <ClInclude Include="..\..\src\compiler\translator\glslang_tab.h"/>
...@@ -217,6 +216,7 @@ ...@@ -217,6 +216,7 @@
<ClCompile Include="..\..\src\compiler\translator\ShaderVariable.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ShaderVariable.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\ParseContext.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ParseContext.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp"/> <ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InitializeVariables.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InitializeDll.cpp"/> <ClCompile Include="..\..\src\compiler\translator\InitializeDll.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\PoolAlloc.cpp"/> <ClCompile Include="..\..\src\compiler\translator\PoolAlloc.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\BlockLayoutEncoder.cpp"/> <ClCompile Include="..\..\src\compiler\translator\BlockLayoutEncoder.cpp"/>
...@@ -228,7 +228,6 @@ ...@@ -228,7 +228,6 @@
<ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\ValidateOutputs.cpp"/> <ClCompile Include="..\..\src\compiler\translator\ValidateOutputs.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\TranslatorESSL.cpp"/> <ClCompile Include="..\..\src\compiler\translator\TranslatorESSL.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\InitializeGLPosition.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"/> <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\parseConst.cpp"/> <ClCompile Include="..\..\src\compiler\translator\parseConst.cpp"/>
<ClCompile Include="..\..\src\compiler\translator\VersionGLSL.cpp"/> <ClCompile Include="..\..\src\compiler\translator\VersionGLSL.cpp"/>
......
projects/src/translator_static.vcxproj.filters
...@@ -66,9 +66,6 @@ ...@@ -66,9 +66,6 @@
<ClInclude Include="..\..\src\common\event_tracer.h"> <ClInclude Include="..\..\src\common\event_tracer.h">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\common\commit.h">
<Filter>src\common</Filter>
</ClInclude>
<ClCompile Include="..\..\src\common\utilities.cpp"> <ClCompile Include="..\..\src\common\utilities.cpp">
<Filter>src\common</Filter> <Filter>src\common</Filter>
</ClCompile> </ClCompile>
...@@ -153,6 +150,9 @@ ...@@ -153,6 +150,9 @@
<ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h"> <ClInclude Include="..\..\src\compiler\translator\PoolAlloc.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h"> <ClInclude Include="..\..\src\compiler\translator\BuiltInFunctionEmulator.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -168,6 +168,9 @@ ...@@ -168,6 +168,9 @@
<ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp"> <ClCompile Include="..\..\src\compiler\translator\RemoveTree.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\compiler\translator\InitializeVariables.cpp">
<Filter>src\compiler\translator</Filter>
</ClCompile>
<ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h"> <ClInclude Include="..\..\src\compiler\translator\UnfoldShortCircuit.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -252,9 +255,9 @@ ...@@ -252,9 +255,9 @@
<ClInclude Include="..\..\src\compiler\translator\InitializeDll.h"> <ClInclude Include="..\..\src\compiler\translator\InitializeDll.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\InitializeGLPosition.cpp"> <ClInclude Include="..\..\src\compiler\translator\InitializeVariables.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\localintermediate.h"> <ClInclude Include="..\..\src\compiler\translator\localintermediate.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -267,9 +270,6 @@ ...@@ -267,9 +270,6 @@
<ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h"> <ClInclude Include="..\..\src\compiler\translator\ForLoopUnroll.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\compiler\translator\InitializeGLPosition.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h"> <ClInclude Include="..\..\src\compiler\translator\ShaderVariable.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -282,9 +282,6 @@ ...@@ -282,9 +282,6 @@
<ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp"> <ClCompile Include="..\..\src\compiler\translator\VariablePacker.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
<Filter>src\compiler\translator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h"> <ClInclude Include="..\..\src\compiler\translator\TranslatorHLSL.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
...@@ -375,7 +372,7 @@ ...@@ -375,7 +372,7 @@
<ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp"> <ClCompile Include="..\..\src\compiler\translator\SymbolTable.cpp">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\compiler\translator\DetectDiscontinuity.h"> <ClInclude Include="..\..\src\compiler\translator\InitializeParseContext.h">
<Filter>src\compiler\translator</Filter> <Filter>src\compiler\translator</Filter>
</ClInclude> </ClInclude>
<ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp"> <ClCompile Include="..\..\src\compiler\translator\DirectiveHandler.cpp">
......
src/angle.gypi
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
'action_name': 'Generate Commit ID Header', 'action_name': 'Generate Commit ID Header',
'message': 'Generating commit ID header...', 'message': 'Generating commit ID header...',
'inputs': [ 'commit_id.bat' ], 'inputs': [ 'commit_id.bat' ],
'outputs': ['common/commit.h'], 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/commit.h'],
'action': ['<(angle_relative_src_path)commit_id.bat'], 'action': ['<(angle_relative_src_path)commit_id.bat <(SHARED_INTERMEDIATE_DIR)'],
} }
] #actions ] #actions
}, },
......
src/commit_id.bat
...@@ -2,10 +2,14 @@ ...@@ -2,10 +2,14 @@
REM commit hash REM commit hash
(FOR /F "delims=" %%i IN ('call git rev-parse --short^=12 HEAD') DO set _Str=%%i) || (set _Str=badf00dbad00) (FOR /F "delims=" %%i IN ('call git rev-parse --short^=12 HEAD') DO set _Str=%%i) || (set _Str=badf00dbad00)
set _Str=#define COMMIT_HASH %_Str% set _Str=#define ANGLE_COMMIT_HASH "%_Str%"
echo %_Str% > %~dp0\common\commit.h echo %_Str% > %1%\commit.h
REM commit hash size
set _Str=#define ANGLE_COMMIT_HASH_SIZE 12
echo %_Str% >> %1%\commit.h
REM commit date REM commit date
(FOR /F "delims=" %%i IN ('git show -s --format^="%%ci" HEAD') DO set _Str=%%i) || (set _Str=Unknown Date) (FOR /F "delims=" %%i IN ('git show -s --format^="%%ci" HEAD') DO set _Str=%%i) || (set _Str=Unknown Date)
set _Str=#define COMMIT_DATE "%_Str%" set _Str=#define ANGLE_COMMIT_DATE "%_Str%"
echo %_Str% >> %~dp0\common\commit.h echo %_Str% >> %1%\commit.h
src/common/version.h
#include "commit.h" #include "commit.h"
#define MAJOR_VERSION 2 #define ANGLE_MAJOR_VERSION 1
#define MINOR_VERSION 1 #define ANGLE_MINOR_VERSION 3
#define STRINGIFY(x) #x #define ANGLE_STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define ANGLE_MACRO_STRINGIFY(x) ANGLE_STRINGIFY(x)
#define COMMIT_STRING MACRO_STRINGIFY(COMMIT_HASH) #define ANGLE_VERSION_STRING \
#define COMMIT_STRING_LEN sizeof(COMMIT_STRING) ANGLE_MACRO_STRINGIFY(ANGLE_MAJOR_VERSION) "." \
ANGLE_MACRO_STRINGIFY(ANGLE_MINOR_VERSION) "." \
#define VERSION_STRING MACRO_STRINGIFY(MAJOR_VERSION) "." MACRO_STRINGIFY(MINOR_VERSION) "." COMMIT_STRING ANGLE_COMMIT_HASH
src/libEGL.gypi
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
'.', '.',
'../include', '../include',
'libGLESv2', 'libGLESv2',
'<(SHARED_INTERMEDIATE_DIR)',
], ],
'sources': 'sources':
[ [
......
src/libEGL/libEGL.cpp
...@@ -184,7 +184,7 @@ const char *__stdcall eglQueryString(EGLDisplay dpy, EGLint name) ...@@ -184,7 +184,7 @@ const char *__stdcall eglQueryString(EGLDisplay dpy, EGLint name)
case EGL_VENDOR: case EGL_VENDOR:
return egl::success(display->getVendorString()); return egl::success(display->getVendorString());
case EGL_VERSION: case EGL_VERSION:
return egl::success("1.4 (ANGLE " VERSION_STRING ")"); return egl::success("1.4 (ANGLE " ANGLE_VERSION_STRING ")");
} }
return egl::error(EGL_BAD_PARAMETER, (const char*)NULL); return egl::error(EGL_BAD_PARAMETER, (const char*)NULL);
......
src/libEGL/libEGL.rc
...@@ -54,8 +54,8 @@ END ...@@ -54,8 +54,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION MAJOR_VERSION,MINOR_VERSION,0,0 FILEVERSION ANGLE_MAJOR_VERSION,ANGLE_MINOR_VERSION,0,0
PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,0,0 PRODUCTVERSION ANGLE_MAJOR_VERSION,ANGLE_MINOR_VERSION,0,0
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
...@@ -71,14 +71,14 @@ BEGIN ...@@ -71,14 +71,14 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "ANGLE libEGL Dynamic Link Library" VALUE "FileDescription", "ANGLE libEGL Dynamic Link Library"
VALUE "FileVersion", VERSION_STRING VALUE "FileVersion", ANGLE_VERSION_STRING
VALUE "InternalName", "libEGL" VALUE "InternalName", "libEGL"
VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc." VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc."
VALUE "OriginalFilename", "libEGL.dll" VALUE "OriginalFilename", "libEGL.dll"
VALUE "PrivateBuild", VERSION_STRING VALUE "PrivateBuild", ANGLE_VERSION_STRING
VALUE "ProductName", "ANGLE libEGL Dynamic Link Library" VALUE "ProductName", "ANGLE libEGL Dynamic Link Library"
VALUE "ProductVersion", VERSION_STRING VALUE "ProductVersion", ANGLE_VERSION_STRING
VALUE "Comments", "Build Date: " COMMIT_DATE VALUE "Comments", "Build Date: " ANGLE_COMMIT_DATE
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
src/libGLESv2.gypi
...@@ -21,12 +21,13 @@ ...@@ -21,12 +21,13 @@
{ {
'target_name': 'libGLESv2', 'target_name': 'libGLESv2',
'type': 'shared_library', 'type': 'shared_library',
'dependencies': [ 'translator_static', 'commit_id', 'copy_compiler_dll' ], 'dependencies': [ 'translator', 'commit_id', 'copy_compiler_dll' ],
'include_dirs': 'include_dirs':
[ [
'.', '.',
'../include', '../include',
'libGLESv2', 'libGLESv2',
'<(SHARED_INTERMEDIATE_DIR)',
], ],
'sources': 'sources':
[ [
......
src/libGLESv2/ProgramBinary.cpp
...@@ -1649,15 +1649,15 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length) ...@@ -1649,15 +1649,15 @@ bool ProgramBinary::load(InfoLog &infoLog, const void *binary, GLsizei length)
int minorVersion = 0; int minorVersion = 0;
stream.read(&majorVersion); stream.read(&majorVersion);
stream.read(&minorVersion); stream.read(&minorVersion);
if (majorVersion != MAJOR_VERSION || minorVersion != MINOR_VERSION) if (majorVersion != ANGLE_MAJOR_VERSION || minorVersion != ANGLE_MINOR_VERSION)
{ {
infoLog.append("Invalid program binary version."); infoLog.append("Invalid program binary version.");
return false; return false;
} }
unsigned char commitString[COMMIT_STRING_LEN]; unsigned char commitString[ANGLE_COMMIT_HASH_SIZE];
stream.read(commitString, COMMIT_STRING_LEN); stream.read(commitString, ANGLE_COMMIT_HASH_SIZE);
if (memcmp(commitString, COMMIT_STRING, sizeof(unsigned char) * COMMIT_STRING_LEN) != 0) if (memcmp(commitString, ANGLE_COMMIT_HASH, sizeof(unsigned char) * ANGLE_COMMIT_HASH_SIZE) != 0)
{ {
infoLog.append("Invalid program binary version."); infoLog.append("Invalid program binary version.");
return false; return false;
...@@ -1875,9 +1875,9 @@ bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length) ...@@ -1875,9 +1875,9 @@ bool ProgramBinary::save(void* binary, GLsizei bufSize, GLsizei *length)
BinaryOutputStream stream; BinaryOutputStream stream;
stream.write(GL_PROGRAM_BINARY_ANGLE); stream.write(GL_PROGRAM_BINARY_ANGLE);
stream.write(MAJOR_VERSION); stream.write(ANGLE_MAJOR_VERSION);
stream.write(MINOR_VERSION); stream.write(ANGLE_MINOR_VERSION);
stream.write(COMMIT_STRING, COMMIT_STRING_LEN); stream.write(ANGLE_COMMIT_HASH, ANGLE_COMMIT_HASH_SIZE);
stream.write(ANGLE_COMPILE_OPTIMIZATION_LEVEL); stream.write(ANGLE_COMPILE_OPTIMIZATION_LEVEL);
for (unsigned int i = 0; i < MAX_VERTEX_ATTRIBS; ++i) for (unsigned int i = 0; i < MAX_VERTEX_ATTRIBS; ++i)
......
src/libGLESv2/libGLESv2.cpp
...@@ -3441,20 +3441,20 @@ const GLubyte* __stdcall glGetString(GLenum name) ...@@ -3441,20 +3441,20 @@ const GLubyte* __stdcall glGetString(GLenum name)
case GL_VERSION: case GL_VERSION:
if (context->getClientVersion() == 2) if (context->getClientVersion() == 2)
{ {
return (GLubyte*)"OpenGL ES 2.0 (ANGLE " VERSION_STRING ")"; return (GLubyte*)"OpenGL ES 2.0 (ANGLE " ANGLE_VERSION_STRING ")";
} }
else else
{ {
return (GLubyte*)"OpenGL ES 3.0 (ANGLE " VERSION_STRING ")"; return (GLubyte*)"OpenGL ES 3.0 (ANGLE " ANGLE_VERSION_STRING ")";
} }
case GL_SHADING_LANGUAGE_VERSION: case GL_SHADING_LANGUAGE_VERSION:
if (context->getClientVersion() == 2) if (context->getClientVersion() == 2)
{ {
return (GLubyte*)"OpenGL ES GLSL ES 1.00 (ANGLE " VERSION_STRING ")"; return (GLubyte*)"OpenGL ES GLSL ES 1.00 (ANGLE " ANGLE_VERSION_STRING ")";
} }
else else
{ {
return (GLubyte*)"OpenGL ES GLSL ES 3.00 (ANGLE " VERSION_STRING ")"; return (GLubyte*)"OpenGL ES GLSL ES 3.00 (ANGLE " ANGLE_VERSION_STRING ")";
} }
case GL_EXTENSIONS: case GL_EXTENSIONS:
return (GLubyte*)((context != NULL) ? context->getCombinedExtensionsString() : ""); return (GLubyte*)((context != NULL) ? context->getCombinedExtensionsString() : "");
......
src/libGLESv2/libGLESv2.rc
...@@ -54,8 +54,8 @@ END ...@@ -54,8 +54,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION MAJOR_VERSION,MINOR_VERSION,0,0 FILEVERSION ANGLE_MAJOR_VERSION,ANGLE_MINOR_VERSION,0,0
PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,0,0 PRODUCTVERSION ANGLE_MAJOR_VERSION,ANGLE_MINOR_VERSION,0,0
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
...@@ -71,14 +71,14 @@ BEGIN ...@@ -71,14 +71,14 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "ANGLE libGLESv2 Dynamic Link Library" VALUE "FileDescription", "ANGLE libGLESv2 Dynamic Link Library"
VALUE "FileVersion", VERSION_STRING VALUE "FileVersion", ANGLE_VERSION_STRING
VALUE "InternalName", "libGLESv2" VALUE "InternalName", "libGLESv2"
VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc." VALUE "LegalCopyright", "Copyright (C) 2011 Google Inc."
VALUE "OriginalFilename", "libGLESv2.dll" VALUE "OriginalFilename", "libGLESv2.dll"
VALUE "PrivateBuild", VERSION_STRING VALUE "PrivateBuild", ANGLE_VERSION_STRING
VALUE "ProductName", "ANGLE libGLESv2 Dynamic Link Library" VALUE "ProductName", "ANGLE libGLESv2 Dynamic Link Library"
VALUE "ProductVersion", VERSION_STRING VALUE "ProductVersion", ANGLE_VERSION_STRING
VALUE "Comments", "Build Date: " COMMIT_DATE VALUE "Comments", "Build Date: " ANGLE_COMMIT_DATE
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
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