diff --git a/lib/sdl3/buildshaders.py b/lib/sdl3/buildshaders.py index 20aaf76..c843a7e 100644 --- a/lib/sdl3/buildshaders.py +++ b/lib/sdl3/buildshaders.py @@ -5,11 +5,20 @@ import os import subprocess -origDir = os.path.abspath(os.path.dirname(__file__)) -shadercrossDir = os.path.join(origDir, 'shadercross') -shadercross = os.path.join(shadercrossDir, 'bin/shadercross') +from sys import platform +origDir = os.path.abspath(os.path.dirname(__file__)) contentDir = os.path.join(origDir, 'content/') +shadercrossDir = os.path.join(origDir, 'shadercross/bin') + +if platform == "linux" or platform == "linux2": + shadercrossDir = os.path.join(shadercrossDir, 'linux') +elif platform == "darwin": + shadercrossDir = os.path.join(shadercrossDir, 'osx') +elif platform == "win32": + shadercrossDir = os.path.join(shadercrossDir, 'win64') + +shadercross = os.path.join(shadercrossDir, 'shadercross') inputFiles = [os.path.abspath(os.path.join(contentDir, x)) for x in os.listdir(contentDir) if x.endswith('.hlsl')] diff --git a/lib/sdl3/content/_cooked/dxil/hello-triangle.frag.dxil b/lib/sdl3/content/_cooked/dxil/hello-triangle.frag.dxil index 0aa0cf2..6115e3a 100644 Binary files a/lib/sdl3/content/_cooked/dxil/hello-triangle.frag.dxil and b/lib/sdl3/content/_cooked/dxil/hello-triangle.frag.dxil differ diff --git a/lib/sdl3/content/_cooked/dxil/hello-triangle.vert.dxil b/lib/sdl3/content/_cooked/dxil/hello-triangle.vert.dxil index 13e4523..3205149 100644 Binary files a/lib/sdl3/content/_cooked/dxil/hello-triangle.vert.dxil and b/lib/sdl3/content/_cooked/dxil/hello-triangle.vert.dxil differ diff --git a/lib/sdl3/shadercross/build_shadercross.py b/lib/sdl3/shadercross/build_shadercross.py index 4932c08..af3c8dc 100755 --- a/lib/sdl3/shadercross/build_shadercross.py +++ b/lib/sdl3/shadercross/build_shadercross.py @@ -31,7 +31,7 @@ os.makedirs(WORKING_DIR, exist_ok=True) BIN_INSTALL_DIR = os.path.join(origDir, 'bin') - from sys import platform +from sys import platform if platform == "linux" or platform == "linux2": BIN_INSTALL_DIR = os.path.join(BIN_INSTALL_DIR, 'linux') elif platform == "darwin":