<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
<ItemGroup Label="ProjectConfigurations">\r
<ProjectConfiguration Include="Debug|Win32">\r
<Configuration>Debug</Configuration>\r
<Platform>Win32</Platform>\r
</ProjectConfiguration>\r
+ <ProjectConfiguration Include="Debug|x64">\r
+ <Configuration>Debug</Configuration>\r
+ <Platform>x64</Platform>\r
+ </ProjectConfiguration>\r
<ProjectConfiguration Include="Release|Win32">\r
<Configuration>Release</Configuration>\r
<Platform>Win32</Platform>\r
</ProjectConfiguration>\r
+ <ProjectConfiguration Include="Release|x64">\r
+ <Configuration>Release</Configuration>\r
+ <Platform>x64</Platform>\r
+ </ProjectConfiguration>\r
</ItemGroup>\r
<PropertyGroup Label="Globals">\r
<ProjectGuid>{C15697F6-5057-016E-BD29-422971875679}</ProjectGuid>\r
<CharacterSet>MultiByte</CharacterSet>\r
<ConfigurationType>StaticLibrary</ConfigurationType>\r
</PropertyGroup>\r
+ <PropertyGroup Label="Locals">\r
+ <PlatformToolset>v120</PlatformToolset>\r
+ </PropertyGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>\r
<ImportGroup Label="ExtensionSettings"/>\r
<ImportGroup Label="PropertySheets">\r
<OutDir>$(SolutionDir)$(Configuration)_$(Platform)\</OutDir>\r
<IntDir>$(OutDir)obj\$(ProjectName)\</IntDir>\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
<TargetName>$(ProjectName)</TargetName>\r
<TargetPath>$(OutDir)lib\$(ProjectName)$(TargetExt)</TargetPath>\r
</PropertyGroup>\r
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
<BufferSecurityCheck>true</BufferSecurityCheck>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
- <DisableSpecificWarnings>4100;4127;4239;4244;4245;4512;4702;4530;4718;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+ <DisableSpecificWarnings>4100;4127;4239;4244;4245;4251;4512;4702;4530;4718;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+ <ExceptionHandling>false</ExceptionHandling>\r
<FunctionLevelLinking>true</FunctionLevelLinking>\r
<MinimalRebuild>false</MinimalRebuild>\r
<Optimization>Disabled</Optimization>\r
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };ANGLE_TRANSLATOR_IMPLEMENTATION;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;ANGLE_TRANSLATOR_IMPLEMENTATION;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>\r
<TreatWarningAsError>true</TreatWarningAsError>\r
<ResourceCompile>\r
<AdditionalIncludeDirectories>..\..\src;..\..\include;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<Culture>0x0409</Culture>\r
- <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };ANGLE_TRANSLATOR_IMPLEMENTATION;NOMINMAX;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_IMPLEMENTATION;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ </ResourceCompile>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+ <ClCompile>\r
+ <AdditionalIncludeDirectories>..\..\src;..\..\include;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>\r
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
+ <BufferSecurityCheck>true</BufferSecurityCheck>\r
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+ <DisableSpecificWarnings>4100;4127;4239;4244;4245;4251;4512;4702;4530;4718;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+ <ExceptionHandling>false</ExceptionHandling>\r
+ <FunctionLevelLinking>true</FunctionLevelLinking>\r
+ <MinimalRebuild>false</MinimalRebuild>\r
+ <Optimization>Disabled</Optimization>\r
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;ANGLE_TRANSLATOR_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>\r
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+ <TreatWarningAsError>true</TreatWarningAsError>\r
+ <WarningLevel>Level4</WarningLevel>\r
+ </ClCompile>\r
+ <Lib>\r
+ <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>\r
+ </Lib>\r
+ <Link>\r
+ <AdditionalDependencies>kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <FixedBaseAddress>false</FixedBaseAddress>\r
+ <GenerateDebugInformation>true</GenerateDebugInformation>\r
+ <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>\r
+ <MapFileName>$(OutDir)$(TargetName).map</MapFileName>\r
+ <SubSystem>Console</SubSystem>\r
+ <TargetMachine>MachineX64</TargetMachine>\r
+ </Link>\r
+ <ResourceCompile>\r
+ <AdditionalIncludeDirectories>..\..\src;..\..\include;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <Culture>0x0409</Culture>\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
</ResourceCompile>\r
</ItemDefinitionGroup>\r
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>\r
<BufferSecurityCheck>true</BufferSecurityCheck>\r
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
- <DisableSpecificWarnings>4100;4127;4239;4244;4245;4512;4702;4530;4718;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+ <DisableSpecificWarnings>4100;4127;4239;4244;4245;4251;4512;4702;4530;4718;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+ <ExceptionHandling>false</ExceptionHandling>\r
<FunctionLevelLinking>true</FunctionLevelLinking>\r
<MinimalRebuild>false</MinimalRebuild>\r
<Optimization>MaxSpeed</Optimization>\r
- <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_HAS_EXCEPTIONS=0;_WINDOWS;WIN32;WIN32_LEAN_AND_MEAN;ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };ANGLE_TRANSLATOR_IMPLEMENTATION;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;ANGLE_TRANSLATOR_IMPLEMENTATION;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
<RuntimeTypeInfo>true</RuntimeTypeInfo>\r
<TreatWarningAsError>true</TreatWarningAsError>\r
<ResourceCompile>\r
<AdditionalIncludeDirectories>..\..\src;..\..\include;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
<Culture>0x0409</Culture>\r
- <PreprocessorDefinitions>ANGLE_PRELOADED_D3DCOMPILER_MODULE_NAMES={ TEXT("d3dcompiler_46.dll"), TEXT("d3dcompiler_43.dll") };ANGLE_TRANSLATOR_IMPLEMENTATION;NOMINMAX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_IMPLEMENTATION;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ </ResourceCompile>\r
+ </ItemDefinitionGroup>\r
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+ <ClCompile>\r
+ <AdditionalIncludeDirectories>..\..\src;..\..\include;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>\r
+ <BufferSecurityCheck>true</BufferSecurityCheck>\r
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+ <DisableSpecificWarnings>4100;4127;4239;4244;4245;4251;4512;4702;4530;4718;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+ <ExceptionHandling>false</ExceptionHandling>\r
+ <FunctionLevelLinking>true</FunctionLevelLinking>\r
+ <MinimalRebuild>false</MinimalRebuild>\r
+ <Optimization>MaxSpeed</Optimization>\r
+ <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;NOMINMAX;ANGLE_TRANSLATOR_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>\r
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
+ <TreatWarningAsError>true</TreatWarningAsError>\r
+ <WarningLevel>Level4</WarningLevel>\r
+ </ClCompile>\r
+ <Lib>\r
+ <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <OutputFile>$(OutDir)lib\$(ProjectName)$(TargetExt)</OutputFile>\r
+ </Lib>\r
+ <Link>\r
+ <AdditionalDependencies>kernel32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;odbc32.lib;odbccp32.lib;delayimp.lib</AdditionalDependencies>\r
+ <AdditionalLibraryDirectories>C:/Program Files (x86)/Windows Kits/8.0/Lib/win8/um/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+ <FixedBaseAddress>false</FixedBaseAddress>\r
+ <GenerateDebugInformation>false</GenerateDebugInformation>\r
+ <ImportLibrary>$(OutDir)lib\$(TargetName).lib</ImportLibrary>\r
+ <MapFileName>$(OutDir)$(TargetName).map</MapFileName>\r
+ <SubSystem>Console</SubSystem>\r
+ <TargetMachine>MachineX64</TargetMachine>\r
+ </Link>\r
+ <ResourceCompile>\r
+ <AdditionalIncludeDirectories>..\..\src;..\..\include;C:\Program Files (x86)\Windows Kits\8.0\Include\shared;C:\Program Files (x86)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+ <Culture>0x0409</Culture>\r
+ <PreprocessorDefinitions>ANGLE_TRANSLATOR_IMPLEMENTATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
</ResourceCompile>\r
</ItemDefinitionGroup>\r
<ItemGroup>\r
</ItemGroup>\r
<ItemGroup>\r
<ClCompile Include="..\..\src\compiler\translator\ShaderLang.cpp"/>\r
+ <ClCompile Include="..\..\src\compiler\translator\ShaderVars.cpp"/>\r
</ItemGroup>\r
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>\r
<ImportGroup Label="ExtensionTargets"/>\r