diff --git a/StandAlone_vs2013.sln b/StandAlone_vs2013.sln new file mode 100644 index 00000000..de6bc615 --- /dev/null +++ b/StandAlone_vs2013.sln @@ -0,0 +1,37 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "glslang_vs2013.vcxproj", "{3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StandAlone", "StandAlone_vs2013.vcxproj", "{660D0A05-69A9-4F09-9664-02FBEB08FAE2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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}.Debug|x64.ActiveCfg = Debug|x64 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Debug|x64.Build.0 = Debug|x64 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.ActiveCfg = Release|Win32 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|Win32.Build.0 = Release|Win32 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|x64.ActiveCfg = Release|x64 + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3}.Release|x64.Build.0 = Release|x64 + {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}.Debug|x64.ActiveCfg = Debug|x64 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Debug|x64.Build.0 = Debug|x64 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.ActiveCfg = Release|Win32 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|Win32.Build.0 = Release|Win32 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.ActiveCfg = Release|x64 + {660D0A05-69A9-4F09-9664-02FBEB08FAE2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/StandAlone_vs2013.vcxproj b/StandAlone_vs2013.vcxproj new file mode 100644 index 00000000..350cd85a --- /dev/null +++ b/StandAlone_vs2013.vcxproj @@ -0,0 +1,292 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + StandAlone + {660D0A05-69A9-4F09-9664-02FBEB08FAE2} + + + + Application + false + MultiByte + v120_xp + + + Application + false + MultiByte + v120_xp + + + Application + MultiByte + v120_xp + + + Application + MultiByte + v120_xp + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + StandAlone\UserM_Debug\ + StandAlone\UserM_Debug64\ + StandAlone\UserM_Debug\ + StandAlone\UserM_Debug64\ + true + true + StandAlone\UserM_Release\ + StandAlone\UserM_Release64\ + StandAlone\UserM_Release\ + StandAlone\UserM_Release64\ + false + false + + + glslangValidator + + + glslangValidator + + + glslangValidator + + + glslangValidator + + + + Disabled + glslang;glslang\OSDependent\Windows + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + EnableFastChecks + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Cdecl + MultiThreadedDebug + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;psapi.lib;lib\x86\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 + + + + + + + + + Disabled + glslang;glslang\OSDependent\Windows + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + EnableFastChecks + + + + + $(IntDir) + $(IntDir) + $(IntDir) + Level3 + true + ProgramDatabase + Cdecl + MultiThreadedDebug + + + odbc32.lib;odbccp32.lib;psapi.lib;lib\x64\Debug\glslang.lib;%(AdditionalDependencies) + true + true + UserM_Debug/StandAlone.pdb + Console + $(OutDir)$(TargetName)$(TargetExt) + MachineX64 + + + UserM_Debug/StandAlone.tlb + + + copy glslangValidator + xcopy /y StandAlone\UserM_Debug64\glslangValidator.exe Test + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + MaxSpeed + OnlyExplicitInline + true + glslang;glslang\OSDependent\Windows + WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + Default + MultiThreaded + true + true + + + + + UserM_Release/ + UserM_Release/ + + + Level3 + true + ProgramDatabase + Cdecl + + + /MACHINE:I386 %(AdditionalOptions) + odbc32.lib;odbccp32.lib;psapi.lib;lib\x86\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 + + + + + MaxSpeed + OnlyExplicitInline + true + glslang;glslang\OSDependent\Windows + WIN32;NDEBUG;_CONSOLE;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + true + Default + MultiThreaded + true + true + + + + + UserM_Release/ + UserM_Release/ + + + Level3 + true + ProgramDatabase + Cdecl + + + odbc32.lib;odbccp32.lib;psapi.lib;lib\x64\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_Release64\glslangValidator.exe Test +xcopy /y StandAlone\UserM_Release64\glslangValidator.exe Install\Windows + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/glslang_vs2010.vcxproj b/glslang_vs2010.vcxproj index f9f4f6ce..a6cb6e22 100644 --- a/glslang_vs2010.vcxproj +++ b/glslang_vs2010.vcxproj @@ -64,13 +64,13 @@ <_ProjectFileVersion>10.0.30319.1 lib\x86\Debug\ - lib\x64\Debug + lib\x64\Debug\ glslang\UserM_Debug\ glslang\UserM_Debug64\ false false lib\x86\Release\ - lib\x64\Release + lib\x64\Release\ glslang\UserM_Release\ glslang\UserM_Release64\ false @@ -88,7 +88,7 @@ Disabled glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) false EnableFastChecks @@ -105,6 +105,9 @@ Default MultiThreadedDebug true + /d2Zi+ %(AdditionalOptions) + true + false /MACHINE:I386 %(AdditionalOptions) @@ -134,7 +137,7 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test Disabled glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) false EnableFastChecks @@ -151,6 +154,8 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test Default MultiThreadedDebug true + /d2Zi+ %(AdditionalOptions) + true /MACHINE:I386 %(AdditionalOptions) @@ -185,7 +190,7 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test OnlyExplicitInline true glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) true false Default @@ -205,6 +210,8 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test OldStyle Cdecl Default + /d2Zi+ %(AdditionalOptions) + true /MACHINE:I386 %(AdditionalOptions) @@ -238,7 +245,7 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test OnlyExplicitInline true glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;%(PreprocessorDefinitions) + NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) true false Default @@ -258,6 +265,8 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test OldStyle Cdecl Default + /d2Zi+ %(AdditionalOptions) + true /MACHINE:I386 %(AdditionalOptions) @@ -307,6 +316,7 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test + @@ -338,6 +348,7 @@ xcopy /y $(IntDir)$(TargetName)$(TargetExt) Test + diff --git a/glslang_vs2013.vcxproj b/glslang_vs2013.vcxproj new file mode 100644 index 00000000..20aee32d --- /dev/null +++ b/glslang_vs2013.vcxproj @@ -0,0 +1,406 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + glslang + {3B146CC5-B2B8-4573-9D46-6139E2EDFEA3} + + + + StaticLibrary + false + MultiByte + v120_xp + + + StaticLibrary + false + MultiByte + v120_xp + + + StaticLibrary + MultiByte + v120_xp + + + StaticLibrary + MultiByte + v120_xp + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + lib\2013\x86\Debug\ + lib\2013\x64\Debug\ + glslang\UserM_Debug\ + glslang\UserM_Debug64\ + false + false + lib\2013\x86\Release\ + lib\2013\x64\Release\ + glslang\UserM_Release\ + glslang\UserM_Release64\ + false + false + false + false + .lib + .lib + .lib + .lib + false + false + + + + Disabled + glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) + false + EnableFastChecks + + + $(IntDir) + $(IntDir) + $(IntDir) + + + Level3 + true + OldStyle + Cdecl + Default + MultiThreadedDebug + true + /d2Zi+ %(AdditionalOptions) + true + false + + + /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 + + + + + Disabled + glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) + false + EnableFastChecks + + + $(IntDir) + $(IntDir) + $(IntDir) + + + Level3 + true + OldStyle + Cdecl + Default + MultiThreadedDebug + true + /d2Zi+ %(AdditionalOptions) + 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 + + + MachineX64 + + + + + MaxSpeed + OnlyExplicitInline + true + glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + true + true + + + UserM_Release/ + UserM_Release/ + + + + + Level3 + true + OldStyle + Cdecl + Default + /d2Zi+ %(AdditionalOptions) + true + + + /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 + + + + + MaxSpeed + OnlyExplicitInline + true + glslang;glslang\MachineIndependent;glslang\OSDependent\Windows;OGLCompilersDLL;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;_USRDLL;TEST_EXPORTS;GENERIC_COMPILER;_HAS_ITERATOR_DEBUGGING=0;_ALLOW_RUNTIME_LIBRARY_MISMATCH;_ALLOW_ITERATOR_DEBUG_LEVEL_MISMATCH;_ALLOW_MSC_VER_MISMATCH;%(PreprocessorDefinitions) + true + false + Default + MultiThreaded + true + true + + + UserM_Release/ + UserM_Release/ + + + + + Level3 + true + OldStyle + Cdecl + Default + /d2Zi+ %(AdditionalOptions) + true + + + /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 + + + MachineX64 + + + + + + 4065 + 4065 + 4065 + 4065 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj + true + true + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + \ No newline at end of file