Compare commits

..

No commits in common. "e9320210387373da086feb4c282fd02e3582b45d" and "7d2f98848207ea62b13051dbec2d043364832aac" have entirely different histories.

3 changed files with 4240 additions and 5 deletions

View File

@ -13,8 +13,6 @@ pub fn build(b: *std.build.Builder) void {
const mode = b.standardReleaseOptions();
const exe = b.addExecutable("zba", "src/main.zig");
exe.setTarget(target);
// Known Folders (%APPDATA%, XDG, etc.)
exe.addPackagePath("known_folders", "lib/known-folders/known-folders.zig");
@ -28,14 +26,16 @@ pub fn build(b: *std.build.Builder) void {
// Argument Parsing Library
exe.addPackagePath("clap", "lib/zig-clap/clap.zig");
// OpenGL 3.3 Bindings
exe.addPackagePath("gl", "lib/gl.zig");
// OpenGL Bindings
exe.addPackagePath("gl", "lib/gl_4v5.zig");
// Zig SDL Bindings: https://github.com/MasterQ32/SDL.zig
const sdk = Sdk.init(b);
sdk.link(exe, .dynamic);
exe.addPackage(sdk.getNativePackage("sdl2"));
exe.setTarget(target);
exe.setBuildMode(mode);
exe.install();

File diff suppressed because it is too large Load Diff

View File

@ -244,7 +244,7 @@ pub const Gui = struct {
fn glGetProcAddress(ctx: SDL.SDL_GLContext, proc: [:0]const u8) ?*anyopaque {
_ = ctx;
return SDL.SDL_GL_GetProcAddress(proc.ptr);
return SDL.SDL_GL_GetProcAddress(@ptrCast([*c]const u8, proc));
}
};