From fe81038bbfd162f5c1d24e7dcb3a98bfdc80288c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 17 Dec 2025 08:53:37 +0100 Subject: [PATCH 1/3] vcpkg: latest greatest --- src/contrib/vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/contrib/vcpkg b/src/contrib/vcpkg index f75c836..e7d7451 160000 --- a/src/contrib/vcpkg +++ b/src/contrib/vcpkg @@ -1 +1 @@ -Subproject commit f75c836a67777a86a2c1116a28b179827f028b66 +Subproject commit e7d7451462697d77ef319ddf2da8ff7320a82662 From feebbacdf4459ea19edcafc1a51d2e854c14faff Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Wed, 17 Dec 2025 15:46:38 +0100 Subject: [PATCH 2/3] Fix compile script --- scripts/compile_shader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/compile_shader.py b/scripts/compile_shader.py index a6de99f..ba6f167 100644 --- a/scripts/compile_shader.py +++ b/scripts/compile_shader.py @@ -38,7 +38,7 @@ def copy_shader(source, dest): def main(): parser = argparse.ArgumentParser() parser.add_argument('--verbose', action='store_true', default=False, help='The full output will be shown') - parser.add_argument('--shader', type=str, default='./', help='The folder containing the shaders') + parser.add_argument('--shader', type=str, required=True, default='./', help='The folder containing the shaders') args = parser.parse_args() print("shader folder: " + str(args.shader)) From cb6583c314611e8ff0934d0e95ba9273ae272220 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 27 Dec 2025 11:55:02 +0100 Subject: [PATCH 3/3] Make shader argument optional and add platform checks Changed the shader argument to be optional and added platform-specific shader copying. --- scripts/compile_shader.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/compile_shader.py b/scripts/compile_shader.py index ba6f167..849f8ca 100644 --- a/scripts/compile_shader.py +++ b/scripts/compile_shader.py @@ -7,6 +7,7 @@ from os import listdir from os.path import isfile, join +TargetFolder = def compile_shader(shadername, shader_out, verbose): if len(shadername) == 0: return @@ -38,7 +39,7 @@ def copy_shader(source, dest): def main(): parser = argparse.ArgumentParser() parser.add_argument('--verbose', action='store_true', default=False, help='The full output will be shown') - parser.add_argument('--shader', type=str, required=True, default='./', help='The folder containing the shaders') + parser.add_argument('--shader', type=str, default='./', help='The folder containing the shaders') args = parser.parse_args() print("shader folder: " + str(args.shader)) @@ -49,8 +50,12 @@ def main(): path = Path(shader) shader_out = path.suffix[1:len(path.suffix)] + ".spv" compile_shader(args.shader + shader, shader_out, args.verbose) - - copy_shader(shader_out, "../bin/debug/shaders") + if os.name == 'nt': + copy_shader(shader_out, "../bin/debug/shaders") + elif os.name == 'posix': + copy_shader(shader_out, "../bin/shaders") + else: + print('Error: unknown platform') if __name__=="__main__": main()