jjanzen/urlg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrate to SDL3

Browse source
This commit is contained in:
jjanzen 2025-01-26 16:38:18 -06:00
parent 873f5db087
commit 7862e6afa3
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored Normal file
View file

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

4
build.zig
View file

@ -35,9 +35,11 @@ pub fn build(b: *std.Build) void {
.target = target,
.optimize = optimize,
});
exe.addLibraryPath(b.path("vendor/SDL/build"));
exe.addIncludePath(b.path("vendor/SDL/include"));
exe.linkSystemLibrary("c");
exe.linkSystemLibrary("ncurses");
exe.linkSystemLibrary("SDL2");
exe.linkSystemLibrary("SDL3");
// This declares intent for the executable to be installed into the
// standard location when the user invokes the "install" step (the default

12
src/frontend/sdl.zig
View file

@ -1,6 +1,6 @@
const std = @import("std");
const sdl = @cImport({
@cInclude("SDL.h");
@cInclude("SDL3/SDL.h");
});
const Action = @import("../actions.zig").Action;
const IOInterface = @import("io_interface.zig").IOInterface;
@ -31,7 +31,7 @@ pub const IO = struct {
while (!quit) {
_ = sdl.SDL_WaitEvent(&event);
switch (event.type) {
sdl.SDL_QUIT => quit = true,
sdl.SDL_EVENT_QUIT => quit = true,
else => {},
}
}
@ -44,17 +44,17 @@ pub const IO = struct {
io.allocator = allocator;
io.sprites = std.ArrayList([*c]sdl.SDL_Surface).init(allocator);
if (sdl.SDL_Init(sdl.SDL_INIT_VIDEO) < 0) return error.SDL_Failed;
if (!sdl.SDL_Init(sdl.SDL_INIT_VIDEO)) return error.SDL_Failed;
io.screen = sdl.SDL_CreateWindow(
"urlg",
sdl.SDL_WINDOWPOS_UNDEFINED,
sdl.SDL_WINDOWPOS_UNDEFINED,
640,
480,
0,
);
if (io.screen == null) return error.SDL_Failed;
io.loadSprite() catch |err| {
io.deinit();
return err;
@ -68,7 +68,7 @@ pub const IO = struct {
pub fn deinit(self: *IO) void {
for (self.sprites.items) |sprite| {
_ = sdl.SDL_FreeSurface(sprite);
_ = sdl.SDL_DestroySurface(sprite);
}
self.sprites.deinit();

1
vendor/SDL vendored Submodule

@ -0,0 +1 @@
Subproject commit 535d80badefc83c5c527ec5748f2a20d6a9310fe