From f359199cc32b1eae3a720240f1b1e51c159bf5ad Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Thu, 23 Jan 2014 21:40:33 +0000 Subject: [PATCH] Support both dynamic CRT and static CRT configurations on VS11 build. The public download needs the static one for user simplicity, while some downstream tools need the dynamic one. git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24977 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- StandAlone.sln | 14 +++- StandAlone.vcxproj | 133 ++++++++++++++++++++++++++++++++++++++ glslang.vcxproj | 158 +++++++++++++++++++++++++++++++++++++++++++++ glslang/Include/revision.h | 4 +- 4 files changed, 305 insertions(+), 4 deletions(-) diff --git a/StandAlone.sln b/StandAlone.sln index e96655e..644057c 100644 --- a/StandAlone.sln +++ b/StandAlone.sln @@ -1,21 +1,31 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StandAlone", "StandAlone.vcxproj", "{660D0A05-69A9-4F09-9664-02FBEB08FAE2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "glslang.vcxproj", "{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug CRT DLL|Win32 = Debug CRT DLL|Win32 Debug|Win32 = Debug|Win32 + Release CRT DLL|Win32 = Release CRT DLL|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug CRT DLL|Win32.ActiveCfg = Debug CRT DLL|Win32 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug CRT DLL|Win32.Build.0 = Debug CRT DLL|Win32 {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.ActiveCfg = Debug|Win32 {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|Win32.Build.0 = Debug|Win32 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release CRT DLL|Win32.ActiveCfg = Release CRT DLL|Win32 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release CRT DLL|Win32.Build.0 = Release CRT DLL|Win32 {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.ActiveCfg = Release|Win32 {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.Build.0 = Release|Win32 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug CRT DLL|Win32.ActiveCfg = Debug CRT DLL|Win32 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug CRT DLL|Win32.Build.0 = Debug CRT DLL|Win32 {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|Win32.ActiveCfg = Debug|Win32 {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|Win32.Build.0 = Debug|Win32 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release CRT DLL|Win32.ActiveCfg = Release CRT DLL|Win32 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release CRT DLL|Win32.Build.0 = Release CRT DLL|Win32 {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.ActiveCfg = Release|Win32 {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/StandAlone.vcxproj b/StandAlone.vcxproj index c96f4b4..aaec386 100644 --- a/StandAlone.vcxproj +++ b/StandAlone.vcxproj @@ -1,10 +1,18 @@  + + Debug CRT DLL + Win32 + Debug Win32 + + Release CRT DLL + Win32 + Release Win32 @@ -21,36 +29,65 @@ MultiByte v110_xp + + Application + false + MultiByte + v110_xp + Application MultiByte v110_xp + + Application + MultiByte + v110_xp + + + + + + + <_ProjectFileVersion>10.0.30319.1 StandAlone\UserM_Debug\ + StandAlone\UserM_Debug\ StandAlone\UserM_Debug\ + StandAlone\UserM_Debug\ true + true StandAlone\UserM_Release\ + StandAlone\UserM_Release\ StandAlone\UserM_Release\ + StandAlone\UserM_Release\ false + false glslangValidator + + glslangValidator + glslangValidator + + glslangValidator + Disabled @@ -95,6 +132,50 @@ + + + Disabled + glslang;glslang\OSDependent\Windows + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + EnableFastChecks + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Cdecl + MultiThreadedDebugDLL + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;psapi.lib;glslang\UserM_Debug\glslang.lib;%(AdditionalDependencies) + true + true + UserM_Debug/StandAlone.pdb + Console + $(OutDir)$(TargetName)$(TargetExt) + + + UserM_Debug/StandAlone.tlb + + + copy glslangValidator + xcopy /y StandAlone\UserM_Debug\glslangValidator.exe Test + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + MaxSpeed @@ -147,6 +228,58 @@ xcopy /y StandAlone\UserM_Release\glslangValidator.exe Install\Windows 0x0409 + + + MaxSpeed + OnlyExplicitInline + true + glslang;glslang\OSDependent\Windows + WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;%(PreprocessorDefinitions) + true + Default + MultiThreadedDLL + true + true + + + + + UserM_Release/ + UserM_Release/ + + + Level3 + true + ProgramDatabase + Cdecl + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;psapi.lib;glslang\UserM_Release\glslang.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + + + true + UserM_Release/StandAlone.pdb + Console + true + true + + + UserM_Release/StandAlone.tlb + + + copy glslangValidator + xcopy /y StandAlone\UserM_Release\glslangValidator.exe Test +xcopy /y StandAlone\UserM_Release\glslangValidator.exe Install\Windows + + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + diff --git a/glslang.vcxproj b/glslang.vcxproj index a95ec88..0e2afa8 100644 --- a/glslang.vcxproj +++ b/glslang.vcxproj @@ -1,10 +1,18 @@  + + Debug CRT DLL + Win32 + Debug Win32 + + Release CRT DLL + Win32 + Release Win32 @@ -21,33 +29,60 @@ MultiByte v110_xp + + StaticLibrary + false + MultiByte + v110_xp + StaticLibrary MultiByte v110_xp + + StaticLibrary + MultiByte + v110_xp + + + + + + + <_ProjectFileVersion>10.0.30319.1 glslang\UserM_Debug\ + glslang\UserM_Debug\ glslang\UserM_Debug\ + glslang\UserM_Debug\ false + false glslang\UserM_Release\ + glslang\UserM_Release\ glslang\UserM_Release\ + glslang\UserM_Release\ false + false false + false .lib + .lib .lib + .lib false + false @@ -98,6 +133,55 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q + + + Disabled + glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + EnableFastChecks + + + $(IntDir) + $(IntDir) + $(IntDir) + + + Level3 + true + ProgramDatabase + Cdecl + Default + MultiThreadedDebugDLL + true + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + false + libcmtd.lib;libcd.lib;libcmt.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + true + UserM_Debug/glslang.pdb + Console + UserM_Debug/generic/glslang.lib + $(IntDir)$(TargetName)$(TargetExt) + + + UserM_Debug/generic/glslang.tlb + + + copy dll + del Test\$(TargetName)$(TargetExt) +xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q + + MaxSpeed @@ -154,11 +238,69 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q + + + MaxSpeed + OnlyExplicitInline + true + glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;%(PreprocessorDefinitions) + true + false + Default + MultiThreadedDLL + true + true + + + UserM_Release/ + UserM_Release/ + + + + + Level3 + true + ProgramDatabase + Cdecl + Default + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + UserM_Release/generic/glslang.dll + true + libcmtd.lib;libcd.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + true + UserM_Release/generic/glslang.pdb + Console + true + true + UserM_Release/generic/glslang.lib + + + UserM_Release/generic/glslang.tlb + + + copy dll + del Test\$(TargetName)$(TargetExt) +xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + SubWCRev . glslang/Include/revision.template glslang/Include/revision.h -q + + 4065 + 4065 4065 + 4065 @@ -188,9 +330,13 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test true + true $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj true + true $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj @@ -226,17 +372,29 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test Document Executing Bison on glslang.y + Executing Bison on glslang.y SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple cd %(RootDir)%(Directory) %(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp + SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple +SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple +cd %(RootDir)%(Directory) +%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp + %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp Executing Bison on glslang.y + Executing Bison on glslang.y SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple cd %(RootDir)%(Directory) %(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp + SET BISON_SIMPLE=%(RootDir)%(Directory)..\..\tools\bison.simple +SET BISON_HAIRY=%(RootDir)%(Directory)..\..\tools\bison.simple +cd %(RootDir)%(Directory) +%(RootDir)%(Directory)..\..\tools\bison.exe --defines=glslang_tab.cpp.h -t glslang.y -o glslang_tab.cpp %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp + %(RootDir)%(Directory)%(Filename)_tab.cpp.h;%(RootDir)%(Directory)%(Filename)_tab.cpp diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h index 5e9835a..2aa77a0 100644 --- a/glslang/Include/revision.h +++ b/glslang/Include/revision.h @@ -9,5 +9,5 @@ // source have to figure out how to create revision.h just to get a build // going. However, if it is not updated, it can be a version behind. -#define GLSLANG_REVISION "24959" -#define GLSLANG_DATE "2014/01/22 16:37:55" +#define GLSLANG_REVISION "24964" +#define GLSLANG_DATE "2014/01/22 17:35:24" -- 2.7.4