diff --git a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj b/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj deleted file mode 100644 index 760ea1c3..00000000 --- a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj +++ /dev/null @@ -1,421 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - MinSizeRel - x64 - - - Release - Win32 - - - MinSizeRel - Win32 - - - Release - x64 - - - RelWithDebInfo - Win32 - - - RelWithDebInfo - x64 - - - - {01177620-65CE-3EBF-968A-1EAA8D2379EF} - 7.0 - Win32Proj - Win32 - OGLCompiler - NoUpgrade - - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - StaticLibrary - MultiByte - v141_xp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.20506.1 - OGLCompilerd - OGLCompilerd - .lib - .lib - OGLCompiler - OGLCompiler - .lib - .lib - OGLCompiler - OGLCompiler - .lib - .lib - OGLCompiler - OGLCompiler - .lib - .lib - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - $(SolutionDir)_Output\$(Configuration)\$(PlatformTarget)\ - $(SolutionDir)_Intermediate\$(ProjectName)\$(Configuration)\$(PlatformTarget)\ - - - - Debug/ - EnableFastChecks - CompileAsCpp - ProgramDatabase - Sync - Disabled - Disabled - NotUsing - MultiThreadedDebug - true - false - Level3 - WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) - $(IntDir) - - - WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:X86 - - - - - Debug/ - EnableFastChecks - CompileAsCpp - ProgramDatabase - Sync - Disabled - Disabled - NotUsing - MultiThreadedDebug - true - false - Level3 - WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) - $(IntDir) - - - WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - - - Release/ - CompileAsCpp - Sync - AnySuitable - MaxSpeed - NotUsing - MultiThreaded - true - false - Level3 - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) - $(IntDir) - - - - - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:X86 - - - - - Release/ - CompileAsCpp - Sync - AnySuitable - MaxSpeed - NotUsing - MultiThreaded - true - false - Level3 - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Release";%(PreprocessorDefinitions) - $(IntDir) - - - - - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - - - MinSizeRel/ - CompileAsCpp - Sync - OnlyExplicitInline - MinSpace - NotUsing - MultiThreaded - true - false - Level3 - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) - $(IntDir) - - - - - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:X86 - - - - - MinSizeRel/ - CompileAsCpp - Sync - OnlyExplicitInline - MinSpace - NotUsing - MultiThreaded - true - false - Level3 - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="MinSizeRel";%(PreprocessorDefinitions) - $(IntDir) - - - - - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - - - RelWithDebInfo/ - CompileAsCpp - ProgramDatabase - Sync - OnlyExplicitInline - MaxSpeed - NotUsing - MultiThreaded - true - false - Level3 - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) - $(IntDir) - - - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - %(AdditionalOptions) /machine:X86 - - - - - RelWithDebInfo/ - CompileAsCpp - ProgramDatabase - Sync - OnlyExplicitInline - MaxSpeed - NotUsing - MultiThreaded - true - false - Level3 - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) - $(IntDir) - - - WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - $(ProjectDir)/$(IntDir) - %(Filename).h - %(Filename).tlb - %(Filename)_i.c - %(Filename)_p.c - - - - - - - - - - - \ No newline at end of file diff --git a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters b/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters deleted file mode 100644 index 9ea7337f..00000000 --- a/win32/glslang/OGLCompilersDLL/OGLCompiler.vcxproj.filters +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - {4C2A0BE9-8B7C-3570-80FB-29A3780DFB5C} - - - \ No newline at end of file diff --git a/win32/glslang/SPIRV/SPIRV.vcxproj b/win32/glslang/SPIRV/SPIRV.vcxproj index 39f6cf34..b9ff1486 100644 --- a/win32/glslang/SPIRV/SPIRV.vcxproj +++ b/win32/glslang/SPIRV/SPIRV.vcxproj @@ -182,6 +182,7 @@ Level3 WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -216,6 +217,7 @@ Level3 WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -248,6 +250,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -282,6 +285,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -317,6 +321,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -351,6 +356,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -385,6 +391,7 @@ Level3 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -418,6 +425,7 @@ Level3 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -468,12 +476,6 @@ false Never - - {01177620-65CE-3EBF-968A-1EAA8D2379EF} - OGLCompiler - false - Never - {8D35D808-45F8-3B41-8526-72BCBC568F7B} OSDependent diff --git a/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj b/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj index b84bc3a5..6a74b451 100644 --- a/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj +++ b/win32/glslang/glslang/OSDependent/Windows/OSDependent.vcxproj @@ -181,6 +181,7 @@ Level3 WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -213,6 +214,7 @@ Level3 WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -243,6 +245,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -275,6 +278,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -305,6 +309,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -337,6 +342,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -366,6 +372,7 @@ Level3 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -397,6 +404,7 @@ Level3 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) diff --git a/win32/glslang/glslang/glslang.vcxproj b/win32/glslang/glslang/glslang.vcxproj index 6a1b4bc3..7d9ab4cb 100644 --- a/win32/glslang/glslang/glslang.vcxproj +++ b/win32/glslang/glslang/glslang.vcxproj @@ -182,6 +182,7 @@ Level3 WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -215,6 +216,7 @@ Level3 WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -246,6 +248,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -280,6 +283,7 @@ true + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -311,6 +315,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -344,6 +349,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -374,6 +380,7 @@ Level3 WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -406,6 +413,7 @@ Level3 WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -763,12 +771,6 @@ false Never - - {01177620-65CE-3EBF-968A-1EAA8D2379EF} - OGLCompiler - false - Never - {8D35D808-45F8-3B41-8526-72BCBC568F7B} OSDependent @@ -779,4 +781,4 @@ - + \ No newline at end of file diff --git a/win32/glslang/glslang/glslang.vcxproj.filters b/win32/glslang/glslang/glslang.vcxproj.filters index f63c1e5f..3c35abea 100644 --- a/win32/glslang/glslang/glslang.vcxproj.filters +++ b/win32/glslang/glslang/glslang.vcxproj.filters @@ -30,8 +30,8 @@ - + diff --git a/win32/glslang/hlsl/HLSL.vcxproj b/win32/glslang/hlsl/HLSL.vcxproj index 5617bcbf..f30545f4 100644 --- a/win32/glslang/hlsl/HLSL.vcxproj +++ b/win32/glslang/hlsl/HLSL.vcxproj @@ -180,6 +180,7 @@ Level3 WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -211,6 +212,7 @@ Level3 WIN32;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_DEBUG;_WINDOWS;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Debug\";%(PreprocessorDefinitions) @@ -240,6 +242,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -271,6 +274,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions) @@ -300,6 +304,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -331,6 +336,7 @@ $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"MinSizeRel\";%(PreprocessorDefinitions) @@ -359,6 +365,7 @@ Level3 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -389,6 +396,7 @@ Level3 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR="RelWithDebInfo";%(PreprocessorDefinitions) $(IntDir) + stdcpp17 WIN32;_WINDOWS;NDEBUG;AMD_EXTENSIONS;NV_EXTENSIONS;ENABLE_HLSL;GLSLANG_OSINCLUDE_WIN32;ENABLE_OPT=0;CMAKE_INTDIR=\"RelWithDebInfo\";%(PreprocessorDefinitions) @@ -486,4 +494,4 @@ - + \ No newline at end of file diff --git a/win32/glslang/hlsl/HLSL.vcxproj.filters b/win32/glslang/hlsl/HLSL.vcxproj.filters index 2d858122..119b4af1 100644 --- a/win32/glslang/hlsl/HLSL.vcxproj.filters +++ b/win32/glslang/hlsl/HLSL.vcxproj.filters @@ -1,24 +1,23 @@  - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + diff --git a/win32/snes9xw.sln b/win32/snes9xw.sln index 10cc014f..d3e5d44d 100644 --- a/win32/snes9xw.sln +++ b/win32/snes9xw.sln @@ -21,14 +21,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hlsl", "hlsl", "{0EE28951-7 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HLSL", "glslang\hlsl\HLSL.vcxproj", "{5F003A48-8DC8-3A67-AC87-69EF27CED058}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLCompiler", "glslang\OGLCompilersDLL\OGLCompiler.vcxproj", "{01177620-65CE-3EBF-968A-1EAA8D2379EF}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OSDependent", "glslang\glslang\OSDependent\Windows\OSDependent.vcxproj", "{8D35D808-45F8-3B41-8526-72BCBC568F7B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glslang", "glslang\glslang\glslang.vcxproj", "{BDB39616-8279-33B4-8B93-9049A49BFEBB}" ProjectSection(ProjectDependencies) = postProject {5F003A48-8DC8-3A67-AC87-69EF27CED058} = {5F003A48-8DC8-3A67-AC87-69EF27CED058} - {01177620-65CE-3EBF-968A-1EAA8D2379EF} = {01177620-65CE-3EBF-968A-1EAA8D2379EF} {8D35D808-45F8-3B41-8526-72BCBC568F7B} = {8D35D808-45F8-3B41-8526-72BCBC568F7B} EndProjectSection EndProject @@ -74,14 +71,6 @@ Global {5F003A48-8DC8-3A67-AC87-69EF27CED058}.Release Unicode|Win32.Build.0 = Release|Win32 {5F003A48-8DC8-3A67-AC87-69EF27CED058}.Release Unicode|x64.ActiveCfg = Release|x64 {5F003A48-8DC8-3A67-AC87-69EF27CED058}.Release Unicode|x64.Build.0 = Release|x64 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Debug Unicode|Win32.ActiveCfg = Debug|Win32 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Debug Unicode|Win32.Build.0 = Debug|Win32 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Debug Unicode|x64.ActiveCfg = Debug|x64 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Debug Unicode|x64.Build.0 = Debug|x64 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Release Unicode|Win32.ActiveCfg = Release|Win32 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Release Unicode|Win32.Build.0 = Release|Win32 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Release Unicode|x64.ActiveCfg = Release|x64 - {01177620-65CE-3EBF-968A-1EAA8D2379EF}.Release Unicode|x64.Build.0 = Release|x64 {8D35D808-45F8-3B41-8526-72BCBC568F7B}.Debug Unicode|Win32.ActiveCfg = Debug|Win32 {8D35D808-45F8-3B41-8526-72BCBC568F7B}.Debug Unicode|Win32.Build.0 = Debug|Win32 {8D35D808-45F8-3B41-8526-72BCBC568F7B}.Debug Unicode|x64.ActiveCfg = Debug|x64 @@ -114,7 +103,6 @@ Global {031A55FD-212F-30BB-9E23-93274E16EC78} = {188A2A44-C7BB-420C-93D8-2CE3458925D4} {0EE28951-70D9-3186-B194-FD95656C957A} = {188A2A44-C7BB-420C-93D8-2CE3458925D4} {5F003A48-8DC8-3A67-AC87-69EF27CED058} = {0EE28951-70D9-3186-B194-FD95656C957A} - {01177620-65CE-3EBF-968A-1EAA8D2379EF} = {031A55FD-212F-30BB-9E23-93274E16EC78} {8D35D808-45F8-3B41-8526-72BCBC568F7B} = {031A55FD-212F-30BB-9E23-93274E16EC78} {BDB39616-8279-33B4-8B93-9049A49BFEBB} = {031A55FD-212F-30BB-9E23-93274E16EC78} {B5CC37AE-E321-3064-A3D7-9D41CEED9D4E} = {031A55FD-212F-30BB-9E23-93274E16EC78}