[build.zig] Leverage dependencyFromBuildZig (#4109)

This commit is contained in:
InKryption 2024-06-27 09:52:36 +00:00 committed by GitHub
parent 37205bba84
commit 57b5f11e2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -11,7 +11,7 @@ var raylib_flags_arr: std.ArrayListUnmanaged([]const u8) = .{};
// This has been tested with zig version 0.12.0 // This has been tested with zig version 0.12.0
pub fn addRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, options: Options) !*std.Build.Step.Compile { pub fn addRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode, options: Options) !*std.Build.Step.Compile {
const raylib_dep = b.dependency(options.raylib_dependency_name, .{ const raylib_dep = b.dependencyFromBuildZig(@This(), .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
.raudio = options.raudio, .raudio = options.raudio,
@ -257,7 +257,6 @@ pub const Options = struct {
linux_display_backend: LinuxDisplayBackend = .X11, linux_display_backend: LinuxDisplayBackend = .X11,
opengl_version: OpenglVersion = .auto, opengl_version: OpenglVersion = .auto,
raylib_dependency_name: []const u8 = "raylib",
raygui_dependency_name: []const u8 = "raygui", raygui_dependency_name: []const u8 = "raygui",
}; };
@ -272,11 +271,11 @@ pub const OpenglVersion = enum {
pub fn toCMacroStr(self: @This()) []const u8 { pub fn toCMacroStr(self: @This()) []const u8 {
switch (self) { switch (self) {
.auto => @panic("OpenglVersion.auto cannot be turned into a C macro string"), .auto => @panic("OpenglVersion.auto cannot be turned into a C macro string"),
.gl_1_1 => return "GRAPHICS_API_OPENGL_11", .gl_1_1 => return "GRAPHICS_API_OPENGL_11",
.gl_2_1 => return "GRAPHICS_API_OPENGL_21", .gl_2_1 => return "GRAPHICS_API_OPENGL_21",
.gl_3_3 => return "GRAPHICS_API_OPENGL_33", .gl_3_3 => return "GRAPHICS_API_OPENGL_33",
.gl_4_3 => return "GRAPHICS_API_OPENGL_43", .gl_4_3 => return "GRAPHICS_API_OPENGL_43",
.gles_2 => return "GRAPHICS_API_OPENGL_ES2", .gles_2 => return "GRAPHICS_API_OPENGL_ES2",
.gles_3 => return "GRAPHICS_API_OPENGL_ES3", .gles_3 => return "GRAPHICS_API_OPENGL_ES3",
} }