Support both dynamic CRT and static CRT configurations on VS11 build. The…

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

Support both dynamic CRT and static CRT configurations on VS11 build. The…
f359199c · John Kessenich · efb2b7d4 · f359199c · f359199c · f359199c
Commit f359199c authored Jan 23, 2014 by John Kessenich
Showing with 14 additions and 4 deletions

StandAlone.sln StandAlone.sln +12 -2

StandAlone.vcxproj StandAlone.vcxproj +0 -0

glslang.vcxproj glslang.vcxproj +0 -0

revision.h glslang/Include/revision.h +2 -2

No files found.
--- a/StandAlone.sln
+++ b/StandAlone.sln
-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

--- a/StandAlone.vcxproj
+++ b/StandAlone.vcxproj
--- a/glslang.vcxproj
+++ b/glslang.vcxproj
--- 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"