diff --git a/build.zig.zon b/build.zig.zon index 9a6cca5..a480fc1 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -2,7 +2,7 @@ .name = .spacefarer, .version = "0.0.0", .fingerprint = 0x946ddccb5911fb15, - .minimum_zig_version = "0.14.0", + .minimum_zig_version = "0.15.0", .dependencies = .{}, .paths = .{ "build.zig", diff --git a/src/graphics.zig b/src/graphics.zig index 8660b05..260a6c7 100644 --- a/src/graphics.zig +++ b/src/graphics.zig @@ -379,7 +379,7 @@ fn loadShader(device: *sdl.GPUDevice, path: []const u8, info: sdl.GPUShaderCreat const file = std.fs.cwd().openFile(path, .{}) catch return GameError.OSError; defer file.close(); - const code = file.readToEndAllocOptions(std.heap.c_allocator, 1024 * 1024 * 1024, null, @alignOf(u8), 0) catch return GameError.OSError; + const code = file.readToEndAllocOptions(std.heap.c_allocator, 1024 * 1024 * 1024, null, .@"1", 0) catch return GameError.OSError; defer std.heap.c_allocator.free(code); var updated_info = info; diff --git a/utils/sdl_translator.zig b/utils/sdl_translator.zig index 9704781..5b470cc 100644 --- a/utils/sdl_translator.zig +++ b/utils/sdl_translator.zig @@ -8,15 +8,19 @@ const PREFIX = "SDL_"; pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{}){}; defer _ = gpa.deinit(); - const alloc = gpa.allocator(); + var arena = std.heap.ArenaAllocator.init(gpa.allocator()); + defer arena.deinit(); + const alloc = arena.allocator(); var arg_iter = try std.process.argsWithAllocator(alloc); - defer arg_iter.deinit(); _ = arg_iter.next(); const output = arg_iter.next().?; - const file = try std.fs.createFileAbsolute(output, .{}); + const file = if (std.fs.path.isAbsolute(output)) + try std.fs.createFileAbsolute(output, .{}) + else + try std.fs.cwd().createFile(output, .{}); defer file.close(); const writer = file.writer();