diff --git a/build/win32/gtkpc.py b/build/win32/gtkpc.py index 5deca919d2..919bfa9315 100644 --- a/build/win32/gtkpc.py +++ b/build/win32/gtkpc.py @@ -18,10 +18,10 @@ def main(argv): base_pc = BasePCItems() gdk_parser = argparse.ArgumentParser(description='Setup basic .pc file info') - gdk_parser.add_argument('--broadway', + gdk_parser.add_argument('--vulkan', action='store_const', const=1, - help='GDK with Broadway backend') + help='GSK with Vulkan renderer') gdk_parser.add_argument('--host', required=True, help='Build type') @@ -38,13 +38,13 @@ def main(argv): cairo_backends = 'cairo-win32' gdk_backends = 'win32' gio_package = 'gio-2.0 >= ' + glib_min_ver - broadway_extra_libs = '' + vulkan_extra_libs = '' gdk_args = gdk_parser.parse_args() - if getattr(gdk_args, 'broadway', None) is 1: + if getattr(gdk_args, 'vulkan', None) is 1: # On Visual Studio, we link to zlib1.lib - broadway_extra_libs = '-lzlib1' - gdk_backends += ' broadway' + vulkan_extra_libs = '-lvulkan-1' + gdk_backends += ' vulkan' cairo_backends += ' cairo' pkg_replace_items = {'@GTK_API_VERSION@': '4.0', @@ -70,7 +70,7 @@ def main(argv): '@GDK_EXTRA_CFLAGS@': '', '@GSK_EXTRA_CFLAGS@': '', '@GTK_EXTRA_CFLAGS@': '', - '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs, + '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + vulkan_extra_libs, '@GSK_EXTRA_LIBS@': '', '@GTK_EXTRA_LIBS@': ''} diff --git a/build/win32/vs12/gdk-4.vcxprojin b/build/win32/vs12/gdk-4.vcxprojin index bbb50468ff..9b63e3a4e0 100644 --- a/build/win32/vs12/gdk-4.vcxprojin +++ b/build/win32/vs12/gdk-4.vcxprojin @@ -17,22 +17,6 @@ Release x64 - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway - x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} @@ -40,82 +24,44 @@ Win32Proj + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + StaticLibrary MultiByte true v120 - - StaticLibrary - MultiByte - v120 - StaticLibrary MultiByte true v120 - - StaticLibrary - MultiByte - v120 - - - StaticLibrary - MultiByte - true - v120 - - - StaticLibrary - MultiByte - v120 - - - StaticLibrary - MultiByte - true - v120 - - - StaticLibrary - MultiByte - v120 - - - - - - - - - - + - - - - - - - - - + @@ -134,20 +80,6 @@ EditAndContinue - - - Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -159,17 +91,6 @@ ProgramDatabase - - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - Disabled @@ -184,20 +105,6 @@ ProgramDatabase - - - Disabled - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - _DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - ProgramDatabase - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -209,17 +116,6 @@ ProgramDatabase - - - ..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) - $(GdkDefines);%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - ProgramDatabase - - #include "gdk-4.vs12.sourcefiles" diff --git a/build/win32/vs12/gsk-4.vcxprojin b/build/win32/vs12/gsk-4.vcxprojin index 4837d3d13b..510d5705ff 100755 --- a/build/win32/vs12/gsk-4.vcxprojin +++ b/build/win32/vs12/gsk-4.vcxprojin @@ -5,18 +5,34 @@ Debug Win32 + + Debug_Vulkan + Win32 + Debug x64 + + Debug_Vulkan + x64 + Release Win32 + + Release_Vulkan + Win32 + Release x64 + + Release_Vulkan + x64 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8} @@ -24,18 +40,23 @@ Win32Proj + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + v120 + StaticLibrary MultiByte true v120 - - StaticLibrary - MultiByte - v120 - - + StaticLibrary MultiByte true @@ -46,18 +67,31 @@ MultiByte v120 + + StaticLibrary + MultiByte + v120 + + + StaticLibrary + MultiByte + true + v120 + + + StaticLibrary + MultiByte + true + v120 + - - - - - + @@ -65,6 +99,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -80,6 +134,20 @@ EditAndContinue + + + Disabled + ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) @@ -91,6 +159,17 @@ ProgramDatabase + + + ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + $(GskDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + Disabled @@ -105,6 +184,20 @@ ProgramDatabase + + + Disabled + ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + _DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) @@ -116,22 +209,45 @@ ProgramDatabase + + + ..\..\..\gsk;..\..\..\gdk;%(AdditionalIncludeDirectories) + $(GskDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + + + Level3 + ProgramDatabase + + Generating GSK enumeration sources... $(GenGSKEnumSrcs) ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) + Generating GSK enumeration sources... + $(GenGSKEnumSrcs) + ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) Generating GSK enumeration sources... $(GenGSKEnumSrcs) ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) + Generating GSK enumeration sources... + $(GenGSKEnumSrcs) + ..\..\..\gsk\gskenumtypes.h;..\..\..\gsk\gskenumtypes.c;%(Outputs) Generating GSK resource sources... $(GenGSKRsrcSrcs) ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) + Generating GSK resource sources... + $(GenGSKRsrcSrcs) + ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) Generating GSK resource sources... $(GenGSKRsrcSrcs) ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) + Generating GSK resource sources... + $(GenGSKRsrcSrcs) + ..\..\..\gsk\gskresources.h;..\..\..\gsk\gskresources.c;..\..\..\gsk\gsk.gresource.xml;%(Outputs) diff --git a/build/win32/vs12/gtk+-4.sln b/build/win32/vs12/gtk+-4.sln index cdadd0baef..1e9f3aa791 100644 --- a/build/win32/vs12/gtk+-4.sln +++ b/build/win32/vs12/gtk+-4.sln @@ -29,223 +29,223 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Debug_Broadway|Win32 = Debug_Broadway|Win32 + Debug_Vulkan|Win32 = Debug_Vulkan|Win32 Debug|x64 = Debug|x64 - Debug_Broadway|x64 = Debug_Broadway|x64 + Debug_Vulkan|x64 = Debug_Vulkan|x64 Release|Win32 = Release|Win32 - Release_Broadway|Win32 = Release_Broadway|Win32 + Release_Vulkan|Win32 = Release_Vulkan|Win32 Release|x64 = Release|x64 - Release_Broadway|x64 = Release_Broadway|x64 + Release_Vulkan|x64 = Release_Vulkan|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.ActiveCfg = Debug|Win32 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.Build.0 = Debug|Win32 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Vulkan|Win32.ActiveCfg = Debug_Vulkan|Win32 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Vulkan|Win32.Build.0 = Debug_Vulkan|Win32 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.ActiveCfg = Debug|x64 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.Build.0 = Debug|x64 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Vulkan|x64.ActiveCfg = Debug_Vulkan|x64 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Vulkan|x64.Build.0 = Debug_Vulkan|x64 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.ActiveCfg = Release|Win32 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.Build.0 = Release|Win32 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Vulkan|Win32.ActiveCfg = Release_Vulkan|Win32 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Vulkan|Win32.Build.0 = Release_Vulkan|Win32 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.ActiveCfg = Release|x64 {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.Build.0 = Release|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Vulkan|x64.Build.0 = Release_Vulkan|x64 + {B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Vulkan|x64.ActiveCfg = Release_Vulkan|x64 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.ActiveCfg = Debug|Win32 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.Build.0 = Debug|Win32 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.ActiveCfg = Debug|x64 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.Build.0 = Debug|x64 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Vulkan|x64.Build.0 = Debug|x64 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.ActiveCfg = Release|Win32 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.Build.0 = Release|Win32 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Vulkan|Win32.Build.0 = Release|Win32 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.ActiveCfg = Release|x64 {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.Build.0 = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.Build.0 = Debug|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.Build.0 = Release|Win32 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.ActiveCfg = Release|x64 - {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.Build.0 = Release|x64 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Vulkan|x64.Build.0 = Release|x64 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.ActiveCfg = Debug|Win32 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.Build.0 = Debug|Win32 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.ActiveCfg = Debug|x64 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.Build.0 = Debug|x64 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Vulkan|x64.Build.0 = Debug|x64 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.ActiveCfg = Release|Win32 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.Build.0 = Release|Win32 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Vulkan|Win32.Build.0 = Release|Win32 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.ActiveCfg = Release|x64 {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.Build.0 = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Vulkan|x64.Build.0 = Release|x64 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug|Win32.ActiveCfg = Debug|Win32 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug|Win32.Build.0 = Debug|Win32 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|Win32.ActiveCfg = Debug_Vulkan|Win32 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|Win32.Build.0 = Debug_Vulkan|Win32 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug|x64.ActiveCfg = Debug|x64 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug|x64.Build.0 = Debug|x64 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|x64.ActiveCfg = Debug_Vulkan|x64 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|x64.Build.0 = Debug_Vulkan|x64 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release|Win32.ActiveCfg = Release|Win32 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release|Win32.Build.0 = Release|Win32 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|Win32.ActiveCfg = Release_Vulkan|Win32 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|Win32.Build.0 = Release_Vulkan|Win32 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release|x64.ActiveCfg = Release|x64 {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release|x64.Build.0 = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Broadway|x64.Build.0 = Debug|x64 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Broadway|Win32.Build.0 = Release|Win32 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Broadway|x64.ActiveCfg = Release|x64 - {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Broadway|x64.Build.0 = Release|x64 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|x64.ActiveCfg = Release_Vulkan|x64 + {5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|x64.Build.0 = Release_Vulkan|x64 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.ActiveCfg = Debug|Win32 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.Build.0 = Debug|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Vulkan|Win32.ActiveCfg = Debug_Vulkan|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Vulkan|Win32.Build.0 = Debug_Vulkan|Win32 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.ActiveCfg = Debug|x64 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.Build.0 = Debug|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Vulkan|x64.ActiveCfg = Debug_Vulkan|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Vulkan|x64.Build.0 = Debug_Vulkan|x64 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.ActiveCfg = Release|Win32 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.Build.0 = Release|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Vulkan|Win32.ActiveCfg = Release_Vulkan|Win32 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Vulkan|Win32.Build.0 = Release_Vulkan|Win32 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.ActiveCfg = Release|x64 {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.Build.0 = Release|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Vulkan|x64.ActiveCfg = Release_Vulkan|x64 + {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Vulkan|x64.Build.0 = Release_Vulkan|x64 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.ActiveCfg = Debug|Win32 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.Build.0 = Debug|Win32 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.ActiveCfg = Debug|x64 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.Build.0 = Debug|x64 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Vulkan|x64.Build.0 = Debug|x64 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.ActiveCfg = Release|Win32 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.Build.0 = Release|Win32 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Vulkan|Win32.Build.0 = Release|Win32 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.ActiveCfg = Release|x64 {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.Build.0 = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.Build.0 = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.ActiveCfg = Debug|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.Build.0 = Debug|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.ActiveCfg = Debug|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.Build.0 = Debug|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.ActiveCfg = Release|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.Build.0 = Release|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.ActiveCfg = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.Build.0 = Release|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64 - {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.Build.0 = Release_Broadway|x64 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Vulkan|x64.Build.0 = Release|x64 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.Build.0 = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.ActiveCfg = Debug|x64 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.Build.0 = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Vulkan|x64.Build.0 = Debug|x64 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.ActiveCfg = Release|Win32 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.Build.0 = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Vulkan|Win32.Build.0 = Release|Win32 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.ActiveCfg = Release|x64 {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.Build.0 = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64 - {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.Build.0 = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Vulkan|x64.Build.0 = Release|x64 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.ActiveCfg = Debug|Win32 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.Build.0 = Debug|Win32 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Vulkan|x64.Build.0 = Debug|x64 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.ActiveCfg = Debug|x64 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.Build.0 = Debug|x64 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.ActiveCfg = Release|Win32 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.Build.0 = Release|Win32 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Vulkan|Win32.Build.0 = Release|Win32 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.ActiveCfg = Release|x64 {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.Build.0 = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.Build.0 = Debug|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.Build.0 = Release|Win32 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.ActiveCfg = Release|x64 - {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.Build.0 = Release|x64 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Vulkan|x64.Build.0 = Release|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.ActiveCfg = Debug|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.Build.0 = Debug|Win32 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.ActiveCfg = Debug|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.Build.0 = Debug|x64 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Vulkan|x64.Build.0 = Debug|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.ActiveCfg = Release|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.Build.0 = Release|Win32 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Vulkan|Win32.Build.0 = Release|Win32 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.ActiveCfg = Release|x64 {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.Build.0 = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.Build.0 = Debug|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64 - {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Vulkan|x64.Build.0 = Release|x64 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Vulkan|x64.Build.0 = Debug|x64 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Vulkan|Win32.Build.0 = Release|Win32 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64 {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64 - {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Vulkan|x64.Build.0 = Release|x64 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Vulkan|x64.Build.0 = Debug|x64 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Vulkan|Win32.Build.0 = Release|Win32 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64 {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64 - {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Vulkan|x64.Build.0 = Release|x64 {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32 {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Vulkan|Win32.ActiveCfg = Debug|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Vulkan|Win32.Build.0 = Debug|Win32 {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64 {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Vulkan|x64.ActiveCfg = Debug|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Vulkan|x64.Build.0 = Debug|x64 {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32 {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Vulkan|Win32.ActiveCfg = Release|Win32 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Vulkan|Win32.Build.0 = Release|Win32 {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64 {9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64 - {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Vulkan|x64.ActiveCfg = Release|x64 + {9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Vulkan|x64.Build.0 = Release|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.ActiveCfg = Debug|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.Build.0 = Debug|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Vulkan|Win32.ActiveCfg = Debug_Vulkan|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Vulkan|Win32.Build.0 = Debug_Vulkan|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.ActiveCfg = Debug|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.Build.0 = Debug|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Vulkan|x64.ActiveCfg = Debug_Vulkan|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Vulkan|x64.Build.0 = Debug_Vulkan|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.ActiveCfg = Release|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.Build.0 = Release|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Vulkan|Win32.ActiveCfg = Release_Vulkan|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Vulkan|Win32.Build.0 = Release_Vulkan|Win32 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.ActiveCfg = Release|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.Build.0 = Release|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Vulkan|x64.ActiveCfg = Release_Vulkan|x64 + {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Vulkan|x64.Build.0 = Release_Vulkan|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/win32/vs12/gtk-4.vcxprojin b/build/win32/vs12/gtk-4.vcxprojin index 59fddaa786..5c17aea88f 100644 --- a/build/win32/vs12/gtk-4.vcxprojin +++ b/build/win32/vs12/gtk-4.vcxprojin @@ -5,16 +5,16 @@ Debug Win32 - - Debug_Broadway + + Debug_Vulkan Win32 Debug x64 - - Debug_Broadway + + Debug_Vulkan x64 @@ -22,8 +22,8 @@ Win32 true - - Release_Broadway + + Release_Vulkan Win32 @@ -31,8 +31,8 @@ x64 true - - Release_Broadway + + Release_Vulkan x64 @@ -47,7 +47,7 @@ MultiByte v120 - + DynamicLibrary MultiByte v120 @@ -57,7 +57,7 @@ MultiByte v120 - + DynamicLibrary MultiByte v120 @@ -67,7 +67,7 @@ MultiByte v120 - + DynamicLibrary MultiByte true @@ -78,7 +78,7 @@ MultiByte v120 - + DynamicLibrary MultiByte true @@ -91,7 +91,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -115,16 +115,16 @@ - + true - true + true false - false + false @@ -150,7 +150,7 @@ MachineX86 - + Disabled ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -164,7 +164,7 @@ EditAndContinue - $(GtkAdditionalLibs);%(AdditionalDependencies) + $(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies) $(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(SolutionDir)Debug\$(Platform)\bin\$(ProjectName).lib true @@ -197,7 +197,7 @@ MachineX86 - + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) @@ -208,7 +208,7 @@ ProgramDatabase - $(GtkAdditionalLibs);%(AdditionalDependencies) + $(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies) $(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(SolutionDir)Release\$(Platform)\bin\$(ProjectName).lib true @@ -244,7 +244,7 @@ MachineX64 - + Disabled ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) @@ -258,7 +258,7 @@ ProgramDatabase - $(GtkAdditionalLibs);%(AdditionalDependencies) + $(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies) $(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(SolutionDir)Debug\$(Platform)\bin\$(ProjectName).lib true @@ -291,7 +291,7 @@ MachineX64 - + ..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32;%(AdditionalIncludeDirectories) $(GtkDefines);%(PreprocessorDefinitions) @@ -302,7 +302,7 @@ ProgramDatabase - $(GtkAdditionalLibs);%(AdditionalDependencies) + $(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies) $(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll $(SolutionDir)Release\$(Platform)\bin\$(ProjectName).lib true @@ -322,12 +322,12 @@ Generating GTK+ DBus Sources... $(GenerateGtkDbusBuiltSources) ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) - Generating GTK+ DBus Sources... - $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) - Generating GTK+ DBus Sources... - $(GenerateGtkDbusBuiltSources) - ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) + Generating GTK+ DBus Sources... + $(GenerateGtkDbusBuiltSources) + ..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs) Copying GTK+ Win32 Version Resource... @@ -336,12 +336,12 @@ Copying GTK+ Win32 Version Resource... $(CopyGtkWin32RC) ..\..\..\gtk\gtk-win32.rc;%(Outputs) - Copying GTK+ Win32 Version Resource... - $(CopyGtkWin32RC) - ..\..\..\gtk\gtk-win32.rc;%(Outputs) - Copying GTK+ Win32 Version Resource... - $(CopyGtkWin32RC) - ..\..\..\gtk\gtk-win32.rc;%(Outputs) + Copying GTK+ Win32 Version Resource... + $(CopyGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;%(Outputs) + Copying GTK+ Win32 Version Resource... + $(CopyGtkWin32RC) + ..\..\..\gtk\gtk-win32.rc;%(Outputs) Generating GTK+ Win32 Manifest... @@ -350,12 +350,12 @@ Generating GTK+ Win32 Manifest... $(GenerateGtkWin32Manifest) ..\..\..\gtk\libgtk4.manifest;%(Outputs) - Generating GTK+ Win32 Manifest... - $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk4.manifest;%(Outputs) - Generating GTK+ Win32 Manifest... - $(GenerateGtkWin32Manifest) - ..\..\..\gtk\libgtk4.manifest;%(Outputs) + Generating GTK+ Win32 Manifest... + $(GenerateGtkWin32Manifest) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) + Generating GTK+ Win32 Manifest... + $(GenerateGtkWin32Manifest) + ..\..\..\gtk\libgtk4.manifest;%(Outputs) diff --git a/build/win32/vs12/gtk4-build-defines.props b/build/win32/vs12/gtk4-build-defines.props index d16ec2bc3f..3a8523c1fe 100644 --- a/build/win32/vs12/gtk4-build-defines.props +++ b/build/win32/vs12/gtk4-build-defines.props @@ -13,7 +13,7 @@ GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED imm32.lib winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs) - ws2_32.lib + vulkan-1.lib atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GdkAdditionalLibs) /EXPORT:gdk_win32_display_manager_get_type @@ -60,8 +60,8 @@ $(GdkAdditionalLibs) - - $(GdkBroadwayAdditionalLibs) + + $(VulkanLibs) $(GtkAdditionalLibs) diff --git a/build/win32/vs12/gtk4-gen-srcs.props b/build/win32/vs12/gtk4-gen-srcs.props index 5aeaab1e02..73728f3394 100644 --- a/build/win32/vs12/gtk4-gen-srcs.props +++ b/build/win32/vs12/gtk4-gen-srcs.props @@ -9,8 +9,8 @@ if exist ..\..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h -if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD -if exist ..\..\..\MSVC_$(Configuration)_Broadway del ..\..\..\MSVC_$(Configuration)_Broadway +if exist ..\..\..\GDK_VULKAN_BUILD del ..\..\..\GDK_VULKAN_BUILD +if exist ..\..\..\MSVC_$(Configuration)_Vulkan del ..\..\..\MSVC_$(Configuration)_Vulkan if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib if "$(Configuration)" == "Release" del ..\..\..\MSVC_Debug @@ -21,23 +21,23 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration) :DONE_GDKCONFIG_H - -if exist ..\..\..\MSVC_$(Configuration)_Broadway goto DONE_GDKCONFIG_H + +if exist ..\..\..\MSVC_$(Configuration)_Vulkan goto DONE_GDKCONFIG_H if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug -if "$(Configuration)" == "Release_Broadway" del ..\..\..\MSVC_Debug_Broadway -if "$(Configuration)" == "Debug_Broadway" del ..\..\..\MSVC_Release_Broadway +if "$(Configuration)" == "Release_Vulkan" del ..\..\..\MSVC_Debug_Vulkan +if "$(Configuration)" == "Debug_Vulkan" del ..\..\..\MSVC_Release_Vulkan -copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h -copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD -echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway +copy ..\..\..\gdk\gdkconfig.h.win32_vulkan ..\..\..\gdk\gdkconfig.h +copy ..\..\..\gdk\gdkconfig.h.win32_vulkan ..\..\..\GDK_VULKAN_BUILD +echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Vulkan :DONE_GDKCONFIG_H - + $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml cd ..\..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) cd ..\..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) @@ -50,6 +50,8 @@ echo ^<?xml version='1.0' encoding='UTF-8'?^> > ..\..\..\gsk\gsk.gresou echo ^<gresources^> >> ..\..\..\gsk\gsk.gresource.xml echo ^<gresource prefix='/org/gtk/libgsk'^> >> ..\..\..\gsk\gsk.gresource.xml for /f %%f in ('dir /b ..\..\..\gsk\resources\glsl\*') do echo ^<file alias='glsl/%%f'^>resources/glsl/%%f^</file^> >> ..\..\..\gsk\gsk.gresource.xml +for /f %%f in ('dir /b ..\..\..\gsk\resources\vulkan\*.spv') do echo ^<file alias='vulkan/%%f'^>resources/vulkan/%%f^</file^> >> ..\..\..\gsk\gsk.gresource.xml +for /f %%f in ('dir /b ..\..\..\gsk\resources\vulkan\*.glsl') do echo ^<file alias='vulkan/%%f'^>resources/vulkan/%%f^</file^> >> ..\..\..\gsk\gsk.gresource.xml echo ^</gresource^> >> ..\..\..\gsk\gsk.gresource.xml echo ^</gresources^> >> ..\..\..\gsk\gsk.gresource.xml @@ -67,8 +69,8 @@ $(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\..\gsk -- $(GenGdkConfigHWin32) - - $(GenGdkConfigHBroadway) + + $(GenGdkConfigHVulkan) $(GDbusCodeGenCmd) diff --git a/build/win32/vs12/gtk4-install.propsin b/build/win32/vs12/gtk4-install.propsin index 2a6ea0916f..8044ab478f 100644 --- a/build/win32/vs12/gtk4-install.propsin +++ b/build/win32/vs12/gtk4-install.propsin @@ -9,8 +9,8 @@ mkdir $(CopyDir)\bin mkdir $(CopyDir)\lib\pkgconfig -if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE -if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG +if "$(Configuration)" == "Release_Vulkan" goto DO_VULKAN_RELEASE +if "$(Configuration)" == "Debug_Vulkan" goto DO_VULKAN_DEBUG copy "$(BinDir)\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll" $(CopyDir)\bin copy "$(BinDir)\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb" $(CopyDir)\bin @@ -30,7 +30,7 @@ copy "$(BinDir)\gtk$(ApiVersionShort)-query-settings.pdb" $(CopyDir)\bin copy "$(BinDir)\gtk$(ApiVersionShort)-builder-tool.exe" $(CopyDir)\bin copy "$(BinDir)\gtk$(ApiVersionShort)-builder-tool.pdb" $(CopyDir)\bin -:DO_BROADWAY_RELEASE +:DO_VULKAN_RELEASE copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll $(CopyDir)\bin copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb $(CopyDir)\bin copy .\Release\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib @@ -51,7 +51,7 @@ copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.pdb $(CopyDir) goto DONE_BIN -:DO_BROADWAY_DEBUG +:DO_VULKAN_DEBUG copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll $(CopyDir)\bin copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb $(CopyDir)\bin copy .\Debug\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib @@ -121,18 +121,12 @@ $(CopyDir)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe --ignore-theme-index $(InstalledBins) - - $(InstalledBroadwayBins) - $(GtkDoInstallBin) $(GtkDoInstall) - - $(GtkDoInstallBroadwayHeaders) - $(GtkPostInstall) diff --git a/build/win32/vs12/gtk4-install.vcxproj b/build/win32/vs12/gtk4-install.vcxproj index c7e8d5ee12..7477b4b8f3 100644 --- a/build/win32/vs12/gtk4-install.vcxproj +++ b/build/win32/vs12/gtk4-install.vcxproj @@ -5,32 +5,32 @@ Debug Win32 + + Debug_Vulkan + Win32 + Debug x64 + + Debug_Vulkan + x64 + Release Win32 + + Release_Vulkan + Win32 + Release x64 - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway + + Release_Vulkan x64 @@ -62,24 +62,24 @@ MultiByte v120 - + Utility MultiByte true v120 - + Utility MultiByte v120 - + Utility MultiByte true v120 - + Utility MultiByte v120 @@ -87,15 +87,11 @@ - - - - - + @@ -103,19 +99,23 @@ - + - + - + - + + + + + @@ -125,26 +125,26 @@ $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + + + + + + - - - - - - - + @@ -152,44 +152,44 @@ $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) - blah;%(Outputs) + Installing Build Results... + $(GtkPCFiles) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) + blah;%(Outputs) Installing Build Results... $(GtkPCFiles) $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) blah;%(Outputs) - Installing Build Results... - $(GtkPCFiles) - $(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall) - blah;%(Outputs) + Installing Build Results... + $(GtkPCFiles) + $(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall) + blah;%(Outputs) Generating .pc files... $(GenerateGtkPC) $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPC) --broadway - $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPC) --vulkan + $(GtkPCFiles);%(Outputs) Generating .pc files... $(GenerateGtkPCX64) $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPCX64) --broadway - $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPCX64) --vulkan + $(GtkPCFiles);%(Outputs) Generating .pc files... $(GenerateGtkPC) $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPC) --broadway - $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPC) --vulkan + $(GtkPCFiles);%(Outputs) Generating .pc files... $(GenerateGtkPCX64) $(GtkPCFiles);%(Outputs) - Generating .pc files... - $(GenerateGtkPCX64) --broadway - $(GtkPCFiles);%(Outputs) + Generating .pc files... + $(GenerateGtkPCX64) --vulkan + $(GtkPCFiles);%(Outputs) diff --git a/build/win32/vs12/gtk4-prebuild.vcxproj b/build/win32/vs12/gtk4-prebuild.vcxproj index b3f10d26b7..3b497bdd15 100644 --- a/build/win32/vs12/gtk4-prebuild.vcxproj +++ b/build/win32/vs12/gtk4-prebuild.vcxproj @@ -5,32 +5,32 @@ Debug Win32 + + Debug_Vulkan + Win32 + Debug x64 + + Debug_Vulkan + x64 + Release Win32 + + Release_Vulkan + Win32 + Release x64 - - Debug_Broadway - Win32 - - - Debug_Broadway - x64 - - - Release_Broadway - Win32 - - - Release_Broadway + + Release_Vulkan x64 @@ -62,24 +62,24 @@ MultiByte v120 - + Utility MultiByte true v120 - + Utility MultiByte v120 - + Utility MultiByte true v120 - + Utility MultiByte v120 @@ -103,19 +103,19 @@ - + - + - + - + @@ -125,10 +125,10 @@ $(GlibEtcInstallRoot)\ - $(GlibEtcInstallRoot)\ - - $(GlibEtcInstallRoot)\ - + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + @@ -138,28 +138,28 @@ - + - + - + - + Copying config.h from config.h.win32... $(GenConfigH) ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) Copying config.h from config.h.win32... $(GenConfigH) ..\..\..\config.h;%(Outputs) - Copying config.h from config.h.win32... - $(GenConfigH) - ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(GenConfigH) + ..\..\..\config.h;%(Outputs) Copying gdkconfig from gdkconfig.win32... @@ -169,27 +169,27 @@ $(GenGdkConfigHWin32) ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(Configuration);%(Outputs) - - Copying gdkconfig from gdkconfig.win32_broadway... - $(GenGdkConfigHBroadway) - ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) - Copying gdkconfig from gdkconfig.win32_broadway... - $(GenGdkConfigHBroadway) - ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(Configuration)_Broadway;%(Outputs) + + Copying gdkconfig from gdkconfig.win32_vulkan... + $(GenGdkConfigHVulkan) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_VULKAN_BUILD;..\..\..\MSVC_$(Configuration)_Vulkan;%(Outputs) + Copying gdkconfig from gdkconfig.win32_vulkan... + $(GenGdkConfigHVulkan) + ..\..\..\gdk\gdkconfig.h;..\..\..\GDK_VULKAN_BUILD;..\..\..\MSVC_$(Configuration)_Vulkan;%(Outputs) Copying demos.h from demos.h.win32... $(CopyDemosH) ..\..\..\demos\gtk-demo\demos.h;%(Outputs) - Copying demos.h from demos.h.win32... - $(CopyDemosH) - ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) Copying demos.h from demos.h.win32... $(CopyDemosH) ..\..\..\demos\gtk-demo\demos.h;%(Outputs) - Copying demos.h from demos.h.win32... - $(CopyDemosH) - ..\..\..\demos\gtk-demo\demos.h;%(Outputs) + Copying demos.h from demos.h.win32... + $(CopyDemosH) + ..\..\..\demos\gtk-demo\demos.h;%(Outputs) diff --git a/build/win32/vs12/gtk4-prebuild.vcxproj.filters b/build/win32/vs12/gtk4-prebuild.vcxproj.filters index f97b21d08b..d776972de3 100644 --- a/build/win32/vs12/gtk4-prebuild.vcxproj.filters +++ b/build/win32/vs12/gtk4-prebuild.vcxproj.filters @@ -9,7 +9,7 @@ Resource Files Resource Files - Resource Files + Resource Files Resource Files diff --git a/gdk/Makefile.am b/gdk/Makefile.am index 7b69289171..f40ffc778e 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST += \ gdkkeynames.c \ gen-keyname-table.pl \ gdkconfig.h.win32 \ - gdkconfig.h.win32_broadway \ + gdkconfig.h.win32_vulkan \ gdkkeysyms-update.pl \ gdkmarshalers.list \ gdkwindowimpl.h \ diff --git a/gdk/gdkconfig.h.win32_broadway b/gdk/gdkconfig.h.win32_vulkan similarity index 90% rename from gdk/gdkconfig.h.win32_broadway rename to gdk/gdkconfig.h.win32_vulkan index 39be5c749e..63f83a9946 100644 --- a/gdk/gdkconfig.h.win32_broadway +++ b/gdk/gdkconfig.h.win32_vulkan @@ -16,7 +16,7 @@ G_BEGIN_DECLS #define GDK_WINDOWING_WIN32 -/* #define GDK_WINDOWING_BROADWAY */ +#define GDK_RENDERING_VULKAN G_END_DECLS