greg/LeanDoom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

port to SDL3 + make build more portable

Browse Source
This commit is contained in:
ValorZard
2025-08-29 10:37:31 -07:00
parent 82883b8d66
commit efcd813410
7 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored Normal file
View File

@@ -0,0 +1,6 @@
[submodule "SDL"]
path = SDL
url = https://github.com/libsdl-org/SDL.git
[submodule "SDL_image"]
path = SDL_image
url = https://github.com/libsdl-org/SDL_image.git

7
Engine.lean
View File

@@ -166,21 +166,22 @@ partial def gameLoop (engineState : IO.Ref EngineState) : IO Unit := do
gameLoop engineState gameLoop engineState
partial def run : IO Unit := do partial def run : IO Unit := do
unless (← SDL.init SDL.SDL_INIT_VIDEO) == 0 do unless (← SDL.init SDL.SDL_INIT_VIDEO) == 1 do
IO.println "Failed to initialize SDL" IO.println "Failed to initialize SDL"
return return
unless (← SDL.createWindow "LeanDoomed" 100 100 SCREEN_WIDTH SCREEN_HEIGHT SDL.SDL_WINDOW_SHOWN) != 0 do unless (← SDL.createWindow "LeanDoomed" SCREEN_WIDTH SCREEN_HEIGHT SDL.SDL_WINDOW_SHOWN) != 0 do
IO.println "Failed to create window" IO.println "Failed to create window"
SDL.quit SDL.quit
return return
/- /-
unless (← SDL.createRenderer 4294967295 SDL.SDL_RENDERER_ACCELERATED) != 0 do unless (← SDL.createRenderer) != 0 do
IO.println "Failed to create renderer" IO.println "Failed to create renderer"
SDL.quit SDL.quit
return return
-/ -/
let initialState : EngineState := { let initialState : EngineState := {
deltaTime := 0.0, lastTime := 0, running := true, deltaTime := 0.0, lastTime := 0, running := true,
camera := { x := 1.5, y := 1.5, angle := 0.0 }, camera := { x := 1.5, y := 1.5, angle := 0.0 },

1
SDL Submodule

Submodule SDL added at dc7a3a1219

4
SDL.lean
View File

@@ -21,10 +21,10 @@ opaque init : UInt32 → IO UInt32
opaque quit : IO Unit opaque quit : IO Unit
@[extern "sdl_create_window"] @[extern "sdl_create_window"]
opaque createWindow : String → Int32 → Int32 → Int32 → Int32 → UInt32 → IO UInt32 opaque createWindow : String → Int32 → Int32 → UInt32 → IO UInt32
@[extern "sdl_create_renderer"] @[extern "sdl_create_renderer"]
opaque createRenderer : UInt32 → UInt32 → IO UInt32 opaque createRenderer : Unit → IO UInt32
@[extern "sdl_set_render_draw_color"] @[extern "sdl_set_render_draw_color"]
opaque setRenderDrawColor : UInt8 → UInt8 → UInt8 → UInt8 → IO Int32 opaque setRenderDrawColor : UInt8 → UInt8 → UInt8 → UInt8 → IO Int32

1
SDL_image Submodule

Submodule SDL_image added at 21167aaec8

25
c/sdl.c
View File

@@ -1,15 +1,15 @@
#include <stdint.h> #include <stdint.h>
#include <SDL2/SDL.h> #include <SDL3/SDL.h>
#include <SDL2/SDL_image.h> #include <SDL3_image/SDL_image.h>
#include <lean/lean.h> #include <lean/lean.h>
static SDL_Window* g_window = NULL; static SDL_Window* g_window = NULL;
static SDL_Renderer* g_renderer = NULL; static SDL_Renderer* g_renderer = NULL;
uint32_t sdl_get_version(void) { uint32_t sdl_get_version(void) {
SDL_version compiled; // from https://wiki.libsdl.org/SDL3/SDL_GetVersion
SDL_VERSION(&compiled); const int linked = SDL_GetVersion(); /* reported by linked SDL library */
return compiled.major * 100 + compiled.minor * 10 + compiled.patch; return SDL_VERSIONNUM_MAJOR(linked) * 100 + SDL_VERSIONNUM_MINOR(linked) * 10 + SDL_VERSIONNUM_MICRO(linked);
} }
lean_obj_res sdl_init(uint32_t flags, lean_obj_arg w) { lean_obj_res sdl_init(uint32_t flags, lean_obj_arg w) {
@@ -30,25 +30,24 @@ lean_obj_res sdl_quit(lean_obj_arg w) {
return lean_io_result_mk_ok(lean_box(0)); return lean_io_result_mk_ok(lean_box(0));
} }
lean_obj_res sdl_create_window(lean_obj_arg title, uint32_t x, uint32_t y, uint32_t w, uint32_t h, uint32_t flags, lean_obj_arg world) { lean_obj_res sdl_create_window(lean_obj_arg title, uint32_t w, uint32_t h, uint32_t flags, lean_obj_arg world) {
const char* title_str = lean_string_cstr(title); const char* title_str = lean_string_cstr(title);
g_window = SDL_CreateWindow(title_str, (int)x, (int)y, (int)w, (int)h, flags); g_window = SDL_CreateWindow(title_str, (int)w, (int)h, flags);
if (g_window == NULL) { if (g_window == NULL) {
return lean_io_result_mk_ok(lean_box(0)); return lean_io_result_mk_ok(lean_box(0));
} }
return lean_io_result_mk_ok(lean_box(1)); return lean_io_result_mk_ok(lean_box(1));
} }
lean_obj_res sdl_create_renderer(uint32_t index_unsigned, uint32_t flags, lean_obj_arg w) { lean_obj_res sdl_create_renderer(lean_obj_arg w) {
if (g_window == NULL) { if (g_window == NULL) {
printf("C: No window available for renderer creation\n"); SDL_Log("C: No window available for renderer creation\n");
return lean_io_result_mk_ok(lean_box(0)); return lean_io_result_mk_ok(lean_box(0));
} }
int32_t index = (int32_t)index_unsigned; g_renderer = SDL_CreateRenderer(g_window, NULL);
g_renderer = SDL_CreateRenderer(g_window, index, flags);
if (g_renderer == NULL) { if (g_renderer == NULL) {
const char* error = SDL_GetError(); const char* error = SDL_GetError();
printf("C: SDL_CreateRenderer failed: %s\n", error); SDL_Log("C: SDL_CreateRenderer failed: %s\n", error);
return lean_io_result_mk_ok(lean_box(0)); return lean_io_result_mk_ok(lean_box(0));
} }
return lean_io_result_mk_ok(lean_box(1)); return lean_io_result_mk_ok(lean_box(1));
@@ -74,7 +73,7 @@ lean_obj_res sdl_render_present(lean_obj_arg w) {
lean_obj_res sdl_render_fill_rect(uint32_t x, uint32_t y, uint32_t w, uint32_t h, lean_obj_arg world) { lean_obj_res sdl_render_fill_rect(uint32_t x, uint32_t y, uint32_t w, uint32_t h, lean_obj_arg world) {
if (g_renderer == NULL) return lean_io_result_mk_ok(lean_box_uint32(-1)); if (g_renderer == NULL) return lean_io_result_mk_ok(lean_box_uint32(-1));
SDL_Rect rect = {(int)x, (int)y, (int)w, (int)h}; SDL_FRect rect = {(float)x, (float)y, (float)w, (float)h};
int32_t result = SDL_RenderFillRect(g_renderer, &rect); int32_t result = SDL_RenderFillRect(g_renderer, &rect);
return lean_io_result_mk_ok(lean_box_uint32(result)); return lean_io_result_mk_ok(lean_box_uint32(result));
} }

10
lakefile.lean
View File

@@ -10,8 +10,10 @@ input_file sdl.c where
target sdl.o pkg : FilePath := do target sdl.o pkg : FilePath := do
let srcJob ← sdl.c.fetch let srcJob ← sdl.c.fetch
let oFile := pkg.buildDir / "c" / "sdl.o" let oFile := pkg.buildDir / "c" / "sdl.o"
let leanInclude := "/home/sraya/.elan/toolchains/leanprover--lean4---v4.22.0/include" let leanInclude := (<- getLeanIncludeDir).toString
buildO oFile srcJob #[] #["-fPIC", "-I/usr/local/include/SDL2", "-D_REENTRANT", s!"-I{leanInclude}"] "cc" let sdlInclude := "SDL/include/"
let sdlImageInclude := "SDL_image/include/"
buildO oFile srcJob #[] #["-fPIC", s!"-I{sdlInclude}", s!"-I{sdlImageInclude}", "-D_REENTRANT", s!"-I{leanInclude}", s!"-I{sdlInclude}", s!"-I{sdlImageInclude}"] "cc"
target libleansdl pkg : FilePath := do target libleansdl pkg : FilePath := do
let sdlO ← sdl.o.fetch let sdlO ← sdl.o.fetch
@@ -20,11 +22,11 @@ target libleansdl pkg : FilePath := do
lean_lib SDL where lean_lib SDL where
moreLinkObjs := #[libleansdl] moreLinkObjs := #[libleansdl]
moreLinkArgs := #["-lSDL2", "-lSDL2_image"] moreLinkArgs := #["-lSDL3", "-lSDL3_image"]
lean_lib Engine lean_lib Engine
@[default_target] @[default_target]
lean_exe LeanDoomed where lean_exe LeanDoomed where
root := `Main root := `Main
moreLinkArgs := #["/usr/local/lib/libSDL2.so", "/usr/local/lib/libSDL2_image.so", "-Wl,--allow-shlib-undefined", "-Wl,-rpath=/usr/local/lib/"] moreLinkArgs := #["SDL/build/libSDL3.so", "SDL_image/build/libSDL3_image.so", "-Wl,--allow-shlib-undefined", "-Wl,-rpath=SDL/build/", "-Wl,-rpath=SDL_image/build/"]