Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Zig 0.14/raylib 5.6-dev #185

Draft
wants to merge 2 commits into
base: devel
Choose a base branch
from
+46 −156
Draft

Update to Zig 0.14/raylib 5.6-dev #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae76994
[build.zig] improve build system
HaxSam Dec 24, 2024
ae7cb3f
Update to latest zig master
HaxSam Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Manually tweaked, auto-generated [raylib](https://github.com/raysan5/raylib) bindings for zig.

Bindings tested on raylib version 5.5 and Zig 0.13.0
Bindings tested on raylib version 5.6-dev and Zig 0.14.0-dev.2802+257054a14

Thanks to all the [contributors](https://github.com/Not-Nik/raylib-zig/graphs/contributors) for their help with this
binding.
Expand Down
172 changes: 31 additions & 141 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,140 +6,43 @@ const rl = @import("raylib");

pub const emcc = @import("emcc.zig");

pub const Options = struct {
raudio: bool = true,
rmodels: bool = true,
rshapes: bool = true,
rtext: bool = true,
rtextures: bool = true,
platform: PlatformBackend = .glfw,
shared: bool = false,
linux_display_backend: LinuxDisplayBackend = .X11,
opengl_version: OpenglVersion = .auto,
};

pub const OpenglVersion = enum {
auto,
gl_1_1,
gl_2_1,
gl_3_3,
gl_4_3,
gles_2,
gles_3,
};

pub const LinuxDisplayBackend = enum { X11, Wayland, Both };

pub const PlatformBackend = enum {
glfw,
rgfw,
sdl,
drm,
};
pub const Options = rl.Options;
pub const OpenglVersion = rl.OpenglVersion;
pub const LinuxDisplayBackend = rl.LinuxDisplayBackend;
pub const PlatformBackend = rl.PlatformBackend;

const Program = struct {
name: []const u8,
path: []const u8,
desc: []const u8,
};

fn link(
b: *std.Build,
exe: *std.Build.Step.Compile,
target: std.Build.ResolvedTarget,
optimize: std.builtin.OptimizeMode,
options: Options,
) void {
const lib = getRaylib(b, target, optimize, options);

const target_os = exe.rootModuleTarget().os.tag;
switch (target_os) {
.windows => {
exe.linkSystemLibrary("winmm");
exe.linkSystemLibrary("gdi32");
exe.linkSystemLibrary("opengl32");
},
.macos => {
exe.linkFramework("OpenGL");
exe.linkFramework("Cocoa");
exe.linkFramework("IOKit");
exe.linkFramework("CoreAudio");
exe.linkFramework("CoreVideo");
},
.freebsd, .openbsd, .netbsd, .dragonfly => {
exe.linkSystemLibrary("GL");
exe.linkSystemLibrary("rt");
exe.linkSystemLibrary("dl");
exe.linkSystemLibrary("m");
exe.linkSystemLibrary("X11");
exe.linkSystemLibrary("Xrandr");
exe.linkSystemLibrary("Xinerama");
exe.linkSystemLibrary("Xi");
exe.linkSystemLibrary("Xxf86vm");
exe.linkSystemLibrary("Xcursor");
},
.emscripten, .wasi => {
// When using emscripten, the libries don't need to be linked
// because emscripten is going to do that later.
},
else => { // Linux and possibly others.
exe.linkSystemLibrary("GL");
exe.linkSystemLibrary("rt");
exe.linkSystemLibrary("dl");
exe.linkSystemLibrary("m");
exe.linkSystemLibrary("X11");
},
}

exe.linkLibrary(lib);
}

var _raylib_lib_cache: ?*std.Build.Step.Compile = null;
fn getRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, options: Options) *std.Build.Step.Compile {
if (_raylib_lib_cache) |lib| return lib else {
const raylib = b.dependency("raylib", .{
.target = target,
.optimize = optimize,
.raudio = options.raudio,
.rmodels = options.rmodels,
.rshapes = options.rshapes,
.rtext = options.rtext,
.rtextures = options.rtextures,
.platform = options.platform,
.shared = options.shared,
.linux_display_backend = options.linux_display_backend,
.opengl_version = options.opengl_version,
});

const lib = raylib.artifact("raylib");

const raygui_dep = b.dependency("raygui", .{
.target = target,
.optimize = optimize,
});
const raylib_dep = b.dependency("raylib", .{
.target = target,
.optimize = optimize,
.raudio = options.raudio,
.rmodels = options.rmodels,
.rshapes = options.rshapes,
.rtext = options.rtext,
.rtextures = options.rtextures,
.platform = options.platform,
.shared = options.shared,
.linux_display_backend = options.linux_display_backend,
.opengl_version = options.opengl_version,
});

var gen_step = b.addWriteFiles();
lib.step.dependOn(&gen_step.step);
const raylib = raylib_dep.artifact("raylib");

const raygui_c_path = gen_step.add("raygui.c", "#define RAYGUI_IMPLEMENTATION\n#include \"raygui.h\"\n");
lib.addCSourceFile(.{
.file = raygui_c_path,
.flags = &[_][]const u8{
"-std=gnu99",
"-D_GNU_SOURCE",
"-DGL_SILENCE_DEPRECATION=199309L",
"-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/3674
},
});
lib.addIncludePath(raylib.path("src"));
lib.addIncludePath(raygui_dep.path("src"));
const raygui_dep = b.dependency("raygui", .{
.target = target,
.optimize = optimize,
});

lib.installHeader(raygui_dep.path("src/raygui.h"), "raygui.h");
rl.addRaygui(b, raylib, raygui_dep);

b.installArtifact(lib);
_raylib_lib_cache = lib;
return lib;
}
b.installArtifact(raylib);
return raylib;
}

fn getModule(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode) *std.Build.Module {
Expand Down Expand Up @@ -169,18 +72,9 @@ pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{});
const optimize = b.standardOptimizeOption(.{});

const defaults = Options{};
const options = Options{
.platform = b.option(PlatformBackend, "platform", "Compile raylib in native mode (no X11)") orelse defaults.platform,
.raudio = b.option(bool, "raudio", "Compile with audio support") orelse defaults.raudio,
.rmodels = b.option(bool, "rmodels", "Compile with models support") orelse defaults.rmodels,
.rtext = b.option(bool, "rtext", "Compile with text support") orelse defaults.rtext,
.rtextures = b.option(bool, "rtextures", "Compile with textures support") orelse defaults.rtextures,
.rshapes = b.option(bool, "rshapes", "Compile with shapes support") orelse defaults.rshapes,
.shared = b.option(bool, "shared", "Compile as shared library") orelse defaults.shared,
.linux_display_backend = b.option(LinuxDisplayBackend, "linux_display_backend", "Linux display backend to use") orelse defaults.linux_display_backend,
.opengl_version = b.option(OpenglVersion, "opengl_version", "OpenGL version to use") orelse defaults.opengl_version,
};
const raylib_artifact = this.getRaylib(b, target, optimize, Options.getOptions(b));
const raylib = this.getModule(b, target, optimize);
const raygui = this.gui.getModule(b, target, optimize);

const examples = [_]Program{
.{
Expand Down Expand Up @@ -346,9 +240,6 @@ pub fn build(b: *std.Build) !void {
// },
};

const raylib = this.getModule(b, target, optimize);
const raygui = this.gui.getModule(b, target, optimize);

const raylib_test = b.addTest(.{
.root_source_file = b.path("lib/raylib.zig"),
.target = target,
Expand All @@ -375,12 +266,11 @@ pub fn build(b: *std.Build) !void {
const exe_lib = try emcc.compileForEmscripten(b, ex.name, ex.path, target, optimize);
exe_lib.root_module.addImport("raylib", raylib);
exe_lib.root_module.addImport("raygui", raygui);
const raylib_lib = getRaylib(b, target, optimize, options);

// Note that raylib itself isn't actually added to the exe_lib
// output file, so it also needs to be linked with emscripten.
exe_lib.linkLibrary(raylib_lib);
const link_step = try emcc.linkWithEmscripten(b, &[_]*std.Build.Step.Compile{ exe_lib, raylib_lib });
exe_lib.linkLibrary(raylib_artifact);
const link_step = try emcc.linkWithEmscripten(b, &[_]*std.Build.Step.Compile{ exe_lib, raylib_artifact });
link_step.addArg("--embed-file");
link_step.addArg("resources/");

Expand All @@ -397,7 +287,7 @@ pub fn build(b: *std.Build) !void {
.optimize = optimize,
.target = target,
});
this.link(b, exe, target, optimize, options);
exe.linkLibrary(raylib_artifact);
exe.root_module.addImport("raylib", raylib);
exe.root_module.addImport("raygui", raygui);

Expand Down
12 changes: 6 additions & 6 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.{
.name = "raylib-zig",
.version = "5.5.0",
.version = "5.6.0-dev",
.dependencies = .{
.raylib = .{
.url = "https://github.com/raysan5/raylib/archive/c1ab645ca298a2801097931d1079b10ff7eb9df8.tar.gz",
.hash = "1220d93782859726c2c46a05450615b7edfc82b7319daac50cbc7c3345d660b022d7",
.url = "git+https://github.com/raysan5/raylib#e70f9157bcae046804e754e98a2694adcfdbfa5d",
.hash = "1220f6aef0d678ba6e3d67a60069b5f32dc965a930c797f463840d224759d615b864",
},
.raygui = .{
.url = "https://github.com/raysan5/raygui/archive/1e03efca48c50c5ea4b4a053d5bf04bad58d3e43.tar.gz",
.hash = "122062b24f031e68f0d11c91dfc32aed5baf06caf26ed3c80ea1802f9e788ef1c358",
.url = "git+https://github.com/raysan5/raygui#76b36b597edb70ffaf96f046076adc20d67e7827",
.hash = "1220ce6e40b454766d901ac4a19b2408f84365fcad4e4840c788b59f34a0ed698883",
},
},
.minimum_zig_version = "0.13.0",
.minimum_zig_version = "0.14.0-dev.2802+257054a14",
.paths = .{
"build.zig",
"build.zig.zon",
Expand Down
8 changes: 4 additions & 4 deletions lib/preludes/raylib-prelude.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,8 +2293,8 @@ pub fn textFormat(text: [*:0]const u8, args: anytype) [*:0]const u8 {
comptime {
const info = @typeInfo(@TypeOf(args));
switch (info) {
.Struct => {
if (!info.Struct.is_tuple)
.@"struct" => {
if (!info.@"struct".is_tuple)
@compileError("Args should be in a tuple (call this function like textFormat(.{arg1, arg2, ...});)!");
},
else => {
Expand All @@ -2311,8 +2311,8 @@ pub fn traceLog(logLevel: TraceLogLevel, text: [*:0]const u8, args: anytype) voi
comptime {
const info = @typeInfo(@TypeOf(args));
switch (info) {
.Struct => {
if (!info.Struct.is_tuple)
.@"struct" => {
if (!info.@"struct".is_tuple)
@compileError("Args should be in a tuple (call this function like traceLog(.{arg1, arg2, ...});)!");
},
else => {
Expand Down
8 changes: 4 additions & 4 deletions lib/raylib.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,8 +2293,8 @@ pub fn textFormat(text: [*:0]const u8, args: anytype) [*:0]const u8 {
comptime {
const info = @typeInfo(@TypeOf(args));
switch (info) {
.Struct => {
if (!info.Struct.is_tuple)
.@"struct" => {
if (!info.@"struct".is_tuple)
@compileError("Args should be in a tuple (call this function like textFormat(.{arg1, arg2, ...});)!");
},
else => {
Expand All @@ -2311,8 +2311,8 @@ pub fn traceLog(logLevel: TraceLogLevel, text: [*:0]const u8, args: anytype) voi
comptime {
const info = @typeInfo(@TypeOf(args));
switch (info) {
.Struct => {
if (!info.Struct.is_tuple)
.@"struct" => {
if (!info.@"struct".is_tuple)
@compileError("Args should be in a tuple (call this function like traceLog(.{arg1, arg2, ...});)!");
},
else => {
Expand Down