From 93e8b2d64efdcc58234fcef6f09d7bd1dee4b1b5 Mon Sep 17 00:00:00 2001 From: Ed_ Date: Mon, 1 Jul 2024 12:24:03 -0400 Subject: [PATCH] updates to scripts --- scripts/build_sokol_demo.ps1 | 4 ++-- scripts/build_sokol_library.ps1 | 2 +- scripts/compile_sokol_shaders.ps1 | 6 +++--- scripts/{ => helpers}/devshell.ps1 | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename scripts/{ => helpers}/devshell.ps1 (100%) diff --git a/scripts/build_sokol_demo.ps1 b/scripts/build_sokol_demo.ps1 index 87ac745..6ca8021 100644 --- a/scripts/build_sokol_demo.ps1 +++ b/scripts/build_sokol_demo.ps1 @@ -79,8 +79,8 @@ function build-SokolBackendDemo { write-host 'Building VEFontCache: Sokol Backend Demo' - $compile_shaders = join-path $path_scripts "compile_sokol_shaders.ps1" - & $compile_shaders + # $compile_shaders = join-path $path_scripts "compile_sokol_shaders.ps1" + # & $compile_shaders $executable = join-path $path_build 'sokol_demo.exe' $pdb = join-path $path_build 'sokol_demo.pdb' diff --git a/scripts/build_sokol_library.ps1 b/scripts/build_sokol_library.ps1 index eb82921..6b12082 100644 --- a/scripts/build_sokol_library.ps1 +++ b/scripts/build_sokol_library.ps1 @@ -1,4 +1,4 @@ -$devshell = Join-Path $PSScriptRoot 'devshell.ps1' +$devshell = Join-Path $PSScriptRoot 'helpers/devshell.ps1' & $devshell -arch amd64 $path_root = '../..' diff --git a/scripts/compile_sokol_shaders.ps1 b/scripts/compile_sokol_shaders.ps1 index 5e50416..b60fc01 100644 --- a/scripts/compile_sokol_shaders.ps1 +++ b/scripts/compile_sokol_shaders.ps1 @@ -24,7 +24,7 @@ $flag_format_odin = '--format=sokol_odin' $flag_module = '--module' push-location $path_backend_sokol -& $sokol_shdc --input $shadersrc_blit_atlas --output $shaderout_blit_atlas --slang 'hlsl4' $flag_format_odin $flag_module='blit_atlas' -& $sokol_shdc --input $shadersrc_render_glyph --output $shaderout_render_glyph --slang 'hlsl4' $flag_format_odin $flag_module='render_glyph' -& $sokol_shdc --input $shadersrc_draw_text --output $shaderout_draw_text --slang 'hlsl4' $flag_format_odin $flag_module='draw_text' +& $sokol_shdc --input $shadersrc_blit_atlas --output $shaderout_blit_atlas --slang 'glsl410:glsl300es:hlsl4:metal_macos:wgsl' $flag_format_odin $flag_module='blit_atlas' +& $sokol_shdc --input $shadersrc_render_glyph --output $shaderout_render_glyph --slang 'glsl410:glsl300es:hlsl4:metal_macos:wgsl' $flag_format_odin $flag_module='render_glyph' +& $sokol_shdc --input $shadersrc_draw_text --output $shaderout_draw_text --slang 'glsl410:glsl300es:hlsl4:metal_macos:wgsl' $flag_format_odin $flag_module='draw_text' pop-location diff --git a/scripts/devshell.ps1 b/scripts/helpers/devshell.ps1 similarity index 100% rename from scripts/devshell.ps1 rename to scripts/helpers/devshell.ps1