From 57b5f11e2a2595ea189fae03d41c8b1c194c8dfa Mon Sep 17 00:00:00 2001 From: InKryption <59504965+InKryption@users.noreply.github.com> Date: Thu, 27 Jun 2024 09:52:36 +0000 Subject: [PATCH] [build.zig] Leverage `dependencyFromBuildZig` (#4109) --- src/build.zig | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/build.zig b/src/build.zig index 81d4a7662..e3bb04a00 100644 --- a/src/build.zig +++ b/src/build.zig @@ -11,7 +11,7 @@ var raylib_flags_arr: std.ArrayListUnmanaged([]const u8) = .{}; // 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 { - const raylib_dep = b.dependency(options.raylib_dependency_name, .{ + const raylib_dep = b.dependencyFromBuildZig(@This(), .{ .target = target, .optimize = optimize, .raudio = options.raudio, @@ -257,7 +257,6 @@ pub const Options = struct { linux_display_backend: LinuxDisplayBackend = .X11, opengl_version: OpenglVersion = .auto, - raylib_dependency_name: []const u8 = "raylib", raygui_dependency_name: []const u8 = "raygui", }; @@ -272,11 +271,11 @@ pub const OpenglVersion = enum { pub fn toCMacroStr(self: @This()) []const u8 { switch (self) { - .auto => @panic("OpenglVersion.auto cannot be turned into a C macro string"), - .gl_1_1 => return "GRAPHICS_API_OPENGL_11", - .gl_2_1 => return "GRAPHICS_API_OPENGL_21", - .gl_3_3 => return "GRAPHICS_API_OPENGL_33", - .gl_4_3 => return "GRAPHICS_API_OPENGL_43", + .auto => @panic("OpenglVersion.auto cannot be turned into a C macro string"), + .gl_1_1 => return "GRAPHICS_API_OPENGL_11", + .gl_2_1 => return "GRAPHICS_API_OPENGL_21", + .gl_3_3 => return "GRAPHICS_API_OPENGL_33", + .gl_4_3 => return "GRAPHICS_API_OPENGL_43", .gles_2 => return "GRAPHICS_API_OPENGL_ES2", .gles_3 => return "GRAPHICS_API_OPENGL_ES3", }