projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
angle
/
projects
/
build
/
All.vcxproj
diff --git
a/src/third_party/angle/projects/build/All.vcxproj
b/src/third_party/angle/projects/build/All.vcxproj
index
84c905e
..
3a368df
100644
(file)
--- a/
src/third_party/angle/projects/build/All.vcxproj
+++ b/
src/third_party/angle/projects/build/All.vcxproj
@@
-49,7
+49,7
@@
</PropertyGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\r
<ClCompile>
\r
</PropertyGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
\r
<ClCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
@@
-59,7
+59,7
@@
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>Disabled</Optimization>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>Disabled</Optimization>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
@@
-67,6
+67,7
@@
</ClCompile>
\r
<Lib>
\r
<AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
</ClCompile>
\r
<Lib>
\r
<AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
+ <TargetMachine>MachineX86</TargetMachine>
\r
</Lib>
\r
<Link>
\r
<AdditionalDependencies></AdditionalDependencies>
\r
</Lib>
\r
<Link>
\r
<AdditionalDependencies></AdditionalDependencies>
\r
@@
-79,14
+80,14
@@
<TargetMachine>MachineX86</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
<TargetMachine>MachineX86</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<Culture>0x0409</Culture>
\r
<Culture>0x0409</Culture>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
\r
<ClCompile>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
\r
<ClCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
@@
-96,7
+97,7
@@
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>Disabled</Optimization>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>Disabled</Optimization>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
@@
-116,14
+117,14
@@
<TargetMachine>MachineX64</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
<TargetMachine>MachineX64</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<Culture>0x0409</Culture>
\r
<Culture>0x0409</Culture>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
\r
<ClCompile>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
\r
<ClCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
@@
-132,7
+133,7
@@
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>MaxSpeed</Optimization>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>MaxSpeed</Optimization>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
@@
-140,6
+141,7
@@
</ClCompile>
\r
<Lib>
\r
<AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
</ClCompile>
\r
<Lib>
\r
<AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
\r
+ <TargetMachine>MachineX86</TargetMachine>
\r
</Lib>
\r
<Link>
\r
<AdditionalDependencies></AdditionalDependencies>
\r
</Lib>
\r
<Link>
\r
<AdditionalDependencies></AdditionalDependencies>
\r
@@
-152,14
+154,14
@@
<TargetMachine>MachineX86</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
<TargetMachine>MachineX86</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<Culture>0x0409</Culture>
\r
<Culture>0x0409</Culture>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
\r
<ClCompile>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
\r
<ClCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
\r
<BufferSecurityCheck>true</BufferSecurityCheck>
\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
\r
@@
-168,7
+170,7
@@
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>MaxSpeed</Optimization>
\r
<FunctionLevelLinking>true</FunctionLevelLinking>
\r
<MinimalRebuild>false</MinimalRebuild>
\r
<Optimization>MaxSpeed</Optimization>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>
\r
<TreatWarningAsError>true</TreatWarningAsError>
\r
@@
-188,9
+190,9
@@
<TargetMachine>MachineX64</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
<TargetMachine>MachineX64</TargetMachine>
\r
</Link>
\r
<ResourceCompile>
\r
- <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
include;..\..\samples\angle\sample_
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
+ <AdditionalIncludeDirectories>$(OutDir)obj\global_intermediate\angle;..\..\
src;..\..\include;..\..\src\libGLESv2;..\..\samples\angle\sample_util;..\..\
util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
\r
<Culture>0x0409</Culture>
\r
<Culture>0x0409</Culture>
\r
- <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;
GL_APICALL=;GL_GLEXT_PROTOTYPES=;EGLAPI=;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ "d3dcompiler_46.dll", "d3dcompiler_43.dll" };
%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemGroup>
\r
</ResourceCompile>
\r
</ItemDefinitionGroup>
\r
<ItemGroup>
\r
@@
-225,10
+227,18
@@
<Project>{22DC02D5-1598-943C-13E1-82185B469F81}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
</ProjectReference>
\r
<Project>{22DC02D5-1598-943C-13E1-82185B469F81}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
</ProjectReference>
\r
+ <ProjectReference Include="..\src\libANGLE.vcxproj">
\r
+ <Project>{CAAA04EE-A56A-43FB-D011-1A56053C070C}</Project>
\r
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
+ </ProjectReference>
\r
<ProjectReference Include="..\src\libGLESv2.vcxproj">
\r
<Project>{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
</ProjectReference>
\r
<ProjectReference Include="..\src\libGLESv2.vcxproj">
\r
<Project>{7FBD6F69-B9A4-69F1-A12B-8DACB3F8CD81}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
</ProjectReference>
\r
+ <ProjectReference Include="..\src\libGLESv2_static.vcxproj">
\r
+ <Project>{F8ABD31A-EC2F-A211-D514-076C763B69F9}</Project>
\r
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
+ </ProjectReference>
\r
<ProjectReference Include="..\src\libEGL.vcxproj">
\r
<Project>{FBAEE4F6-562A-588F-01F9-72DCABB3B061}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
<ProjectReference Include="..\src\libEGL.vcxproj">
\r
<Project>{FBAEE4F6-562A-588F-01F9-72DCABB3B061}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
@@
-297,6
+307,10
@@
<Project>{CBE3D362-43EA-60FC-D5AC-490039CA449A}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
</ProjectReference>
\r
<Project>{CBE3D362-43EA-60FC-D5AC-490039CA449A}</Project>
\r
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
</ProjectReference>
\r
+ <ProjectReference Include="..\util\angle_util.vcxproj">
\r
+ <Project>{E4DD691C-228B-A904-A008-10E26DC0F09E}</Project>
\r
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
\r
+ </ProjectReference>
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
\r
<ImportGroup Label="ExtensionTargets"/>
\r
</ItemGroup>
\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
\r
<ImportGroup Label="ExtensionTargets"/>
\r