From 38815c7d50a64b51a8c160b8d2f367bd59932655 Mon Sep 17 00:00:00 2001 From: swipelab Date: Thu, 11 Jun 2026 08:46:32 +0300 Subject: [PATCH] migrate to the restructured sx stdlib paths modules/compiler.sx -> modules/build.sx; stb/stb_truetype/opengl/sdl3 -> modules/ffi/; modules/process.sx -> modules/std/process.sx. Rebuilt for macos + ios-sim; 23/23 logic snapshots pass. --- audio.sx | 4 ++-- board_fx.sx | 4 ++-- board_view.sx | 4 ++-- build.sx | 2 +- main.sx | 10 +++++----- tests/test.sx | 2 +- tools/key_particle.sx | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/audio.sx b/audio.sx index fced133..3e75b61 100644 --- a/audio.sx +++ b/audio.sx @@ -10,8 +10,8 @@ // other targets never reference these symbols nor need the frameworks. #import "modules/std.sx"; -#import "modules/std/objc.sx"; -#import "modules/compiler.sx"; +#import "modules/ffi/objc.sx"; +#import "modules/build.sx"; // AudioToolbox — System Sound Services. SystemSoundID is a UInt32; OSStatus a // SInt32 (0 == noErr); the clip's file is passed as a CFURLRef (opaque ptr). diff --git a/board_fx.sx b/board_fx.sx index 9f76674..284d418 100644 --- a/board_fx.sx +++ b/board_fx.sx @@ -12,8 +12,8 @@ // shrink to nothing) rather than alpha — the soft texture edges carry the fade. #import "modules/std.sx"; #import "modules/math"; -#import "modules/opengl.sx"; -#import "modules/stb.sx"; +#import "modules/ffi/opengl.sx"; +#import "modules/ffi/stb.sx"; #import "modules/gpu/types.sx"; #import "modules/gpu/api.sx"; #import "modules/ui/types.sx"; diff --git a/board_view.sx b/board_view.sx index 0417bdf..a182fe9 100644 --- a/board_view.sx +++ b/board_view.sx @@ -6,8 +6,8 @@ // the grid is a centered square inside the safe-area inset. #import "modules/std.sx"; #import "modules/math"; -#import "modules/opengl.sx"; -#import "modules/stb.sx"; +#import "modules/ffi/opengl.sx"; +#import "modules/ffi/stb.sx"; #import "modules/gpu/types.sx"; #import "modules/gpu/api.sx"; #import "modules/ui/types.sx"; diff --git a/build.sx b/build.sx index b5ccb9d..7b25d8f 100644 --- a/build.sx +++ b/build.sx @@ -1,4 +1,4 @@ -#import "modules/compiler.sx"; +#import "modules/build.sx"; #import "modules/platform/bundle.sx"; configure_build :: () { diff --git a/main.sx b/main.sx index 1aa7cde..faa9bb7 100644 --- a/main.sx +++ b/main.sx @@ -1,11 +1,11 @@ #import "modules/std.sx"; #import "build.sx"; -#import "modules/compiler.sx"; -#import "modules/opengl.sx"; -#import "modules/sdl3.sx"; +#import "modules/build.sx"; +#import "modules/ffi/opengl.sx"; +#import "modules/ffi/sdl3.sx"; #import "modules/math"; -#import "modules/stb.sx"; -#import "modules/stb_truetype.sx"; +#import "modules/ffi/stb.sx"; +#import "modules/ffi/stb_truetype.sx"; #import "modules/gpu/api.sx"; #import "modules/gpu/types.sx"; #import "modules/gpu/metal.sx"; diff --git a/tests/test.sx b/tests/test.sx index 6d3bfdf..5774bfb 100644 --- a/tests/test.sx +++ b/tests/test.sx @@ -5,7 +5,7 @@ // terminates the process NON-ZERO (exit 1) via process.exit, so a broken // assertion fails `tools/run_tests.sh` and the build gate. #import "modules/std.sx"; -proc :: #import "modules/process.sx"; +proc :: #import "modules/std/process.sx"; expect :: (cond: bool, msg: string, loc: Source_Location = #caller_location) { if !cond { diff --git a/tools/key_particle.sx b/tools/key_particle.sx index 6c81f3b..61a0fee 100644 --- a/tools/key_particle.sx +++ b/tools/key_particle.sx @@ -20,7 +20,7 @@ // never hits this — its loops run over 64 board cells, not millions of pixels. #import "modules/std.sx"; #import "modules/math"; -#import "modules/stb.sx"; +#import "modules/ffi/stb.sx"; SRC_PATH :: "/Users/agra/Downloads/m3te_particle.png"; OUT_PATH :: "assets/fx/particle.png";