diff options
Diffstat (limited to 'src/misc.zig')
-rw-r--r-- | src/misc.zig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/misc.zig b/src/misc.zig index ff45adc..9015a02 100644 --- a/src/misc.zig +++ b/src/misc.zig @@ -24,26 +24,24 @@ usingnamespace @cImport({ const allocator = std.heap.c_allocator; const cwd = std.fs.cwd; -const data_dir = @import("build_options").data_dir; +const data_dir = @import("build_options").data_dir ++ [_]u8{ sep }; const free = std.c.free; const sep = std.fs.path.sep; const maxInt = std.math.maxInt; const std = @import("std"); const span = std.mem.span; -const max_size = maxInt(usize); // don't judge me, take care of me -const texture_dir = data_dir ++ [_]u8{ sep } ++ "textures"; - fn check(errorString: fn (c_uint) callconv(.C) [*c]const u8, status: anytype) void { if (status != 0) @panic(span(errorString(@intCast(c_uint, status)))); } -pub export fn loadTexture(filename: [*:0]const u8) GLuint { - var dir = cwd().openDir(texture_dir, .{}) catch unreachable; +pub fn loadTexture(filename: [*:0]const u8) callconv(.C) GLuint { + var dir = cwd().openDir(data_dir ++ "textures", .{}) catch unreachable; defer dir.close(); - var file = dir.readFileAlloc(allocator, span(filename), max_size) + // Don't judge me, take care of me! + var file = dir.readFileAlloc(allocator, span(filename), maxInt(usize)) catch unreachable; defer allocator.free(file); |