diff options
author | Geoff Lang <geofflang@chromium.org> | 2013-10-15 10:40:30 -0400 |
---|---|---|
committer | Geoff Lang <geofflang@chromium.org> | 2013-10-17 09:54:32 -0400 |
commit | 216644bad77dafeea5fc05cf9290d1cffc2b3d60 (patch) | |
tree | 5baef9324ab44016166f1981e22454de45a82db4 /build | |
parent | 31f0dc0a09b1ea6ff03d235080d561840de8eb66 (diff) | |
download | angle-216644bad77dafeea5fc05cf9290d1cffc2b3d60.tar.gz |
Regenerate project files.
Diffstat (limited to 'build')
-rw-r--r-- | build/all.sln | 14 | ||||
-rw-r--r-- | build/all.vcxproj | 14 |
2 files changed, 21 insertions, 7 deletions
diff --git a/build/all.sln b/build/all.sln index b3214679..e806fb93 100644 --- a/build/all.sln +++ b/build/all.sln @@ -10,6 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all", "all.vcxproj", "{F38E ProjectSection(ProjectDependencies) = postProject {7642CFD5-F187-3E3F-F8FF-859949B9F13E} = {7642CFD5-F187-3E3F-F8FF-859949B9F13E} {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} = {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} = {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} {D5D676ED-C189-2A6B-8DE3-F4CA6175550F} = {D5D676ED-C189-2A6B-8DE3-F4CA6175550F} {777AC703-C49D-E67C-F2EA-2BEDE272A25F} = {777AC703-C49D-E67C-F2EA-2BEDE272A25F} {77BF5E61-D417-460B-3577-C6DB11F1C835} = {77BF5E61-D417-460B-3577-C6DB11F1C835} @@ -35,13 +36,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es_util", "..\samples\es_ut EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "essl_to_glsl", "..\samples\essl_to_glsl.vcxproj", "{77BF5E61-D417-460B-3577-C6DB11F1C835}" ProjectSection(ProjectDependencies) = postProject - {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} = {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} = {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} {7642CFD5-F187-3E3F-F8FF-859949B9F13E} = {7642CFD5-F187-3E3F-F8FF-859949B9F13E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "essl_to_hlsl", "..\samples\essl_to_hlsl.vcxproj", "{1B48E1FA-F164-F21D-BA38-D53C2A3D11E0}" ProjectSection(ProjectDependencies) = postProject - {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} = {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} = {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} {7642CFD5-F187-3E3F-F8FF-859949B9F13E} = {7642CFD5-F187-3E3F-F8FF-859949B9F13E} EndProjectSection EndProject @@ -59,7 +60,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "..\src\libEGL.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLESv2", "..\src\libGLESv2.vcxproj", "{D5D676ED-C189-2A6B-8DE3-F4CA6175550F}" ProjectSection(ProjectDependencies) = postProject - {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} = {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} = {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} {7642CFD5-F187-3E3F-F8FF-859949B9F13E} = {7642CFD5-F187-3E3F-F8FF-859949B9F13E} EndProjectSection EndProject @@ -130,6 +131,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texture_wrap", "..\samples\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator", "..\src\translator.vcxproj", "{6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "translator_static", "..\src\translator_static.vcxproj", "{65BE9C8A-0FF1-A4B7-C81E-43801F64E13D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -156,6 +159,10 @@ Global {48E2D2FB-F38E-3449-60F2-D4A11B0EED4A}.Debug|Win32.Build.0 = Debug|Win32 {48E2D2FB-F38E-3449-60F2-D4A11B0EED4A}.Release|Win32.ActiveCfg = Release|Win32 {48E2D2FB-F38E-3449-60F2-D4A11B0EED4A}.Release|Win32.Build.0 = Release|Win32 + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D}.Debug|Win32.ActiveCfg = Debug|Win32 + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D}.Debug|Win32.Build.0 = Debug|Win32 + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D}.Release|Win32.ActiveCfg = Release|Win32 + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D}.Release|Win32.Build.0 = Release|Win32 {6633AF08-BADE-2C68-2017-D4F75DE9694B}.Debug|Win32.ActiveCfg = Debug|Win32 {6633AF08-BADE-2C68-2017-D4F75DE9694B}.Debug|Win32.Build.0 = Debug|Win32 {6633AF08-BADE-2C68-2017-D4F75DE9694B}.Release|Win32.ActiveCfg = Release|Win32 @@ -231,5 +238,6 @@ Global {D5D676ED-C189-2A6B-8DE3-F4CA6175550F} = {607B4E81-FB72-43DF-177C-C1403E500480} {7642CFD5-F187-3E3F-F8FF-859949B9F13E} = {607B4E81-FB72-43DF-177C-C1403E500480} {6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC} = {607B4E81-FB72-43DF-177C-C1403E500480} + {65BE9C8A-0FF1-A4B7-C81E-43801F64E13D} = {607B4E81-FB72-43DF-177C-C1403E500480} EndGlobalSection EndGlobal diff --git a/build/all.vcxproj b/build/all.vcxproj index 6071b0f2..4cb47ca2 100644 --- a/build/all.vcxproj +++ b/build/all.vcxproj @@ -45,7 +45,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <MinimalRebuild>false</MinimalRebuild> <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;%(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_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeTypeInfo>false</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> @@ -55,7 +55,7 @@ <AdditionalLibraryDirectories>$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Lib> <Link> - <AdditionalDependencies>%(AdditionalDependencies);%(AdditionalDependencies)</AdditionalDependencies> + <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)</AdditionalDependencies> <AdditionalLibraryDirectories>$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -66,6 +66,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\samples\gles2_book\Common;..\include;$(ProgramFiles)\Windows Kits\8.0\Include\shared;$(ProgramFiles)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> + <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -78,7 +79,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <MinimalRebuild>false</MinimalRebuild> <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;%(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_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeTypeInfo>false</RuntimeTypeInfo> <TreatWarningAsError>true</TreatWarningAsError> @@ -88,7 +89,7 @@ <AdditionalLibraryDirectories>$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> </Lib> <Link> - <AdditionalDependencies>%(AdditionalDependencies);%(AdditionalDependencies)</AdditionalDependencies> + <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)</AdditionalDependencies> <AdditionalLibraryDirectories>$(ProgramFiles)/Windows Kits/8.0/Lib/win8/um/x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <FixedBaseAddress>false</FixedBaseAddress> <GenerateDebugInformation>true</GenerateDebugInformation> @@ -99,6 +100,7 @@ <ResourceCompile> <AdditionalIncludeDirectories>..\samples\gles2_book\Common;..\include;$(ProgramFiles)\Windows Kits\8.0\Include\shared;$(ProgramFiles)\Windows Kits\8.0\Include\um;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <Culture>0x0409</Culture> + <PreprocessorDefinitions>ANGLE_TRANSLATOR_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> @@ -113,6 +115,10 @@ <Project>{6AC42CF5-8088-F4BE-7C3D-1BD1BD440FCC}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> + <ProjectReference Include="..\src\translator_static.vcxproj"> + <Project>{65BE9C8A-0FF1-A4B7-C81E-43801F64E13D}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> <ProjectReference Include="..\src\libGLESv2.vcxproj"> <Project>{D5D676ED-C189-2A6B-8DE3-F4CA6175550F}</Project> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> |