Skip to content

Commit d72052c

Browse files
committed
build.zig: Avoid deprecated function std.Build.Step.Compile.defineCMacro
1 parent 1d1b398 commit d72052c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

build.zig

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ pub fn addRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
4242
}
4343

4444
fn setDesktopPlatform(raylib: *std.Build.Step.Compile, platform: PlatformBackend) void {
45-
raylib.defineCMacro("PLATFORM_DESKTOP", null);
45+
raylib.root_module.addCMacro("PLATFORM_DESKTOP", "1");
4646

4747
switch (platform) {
48-
.glfw => raylib.defineCMacro("PLATFORM_DESKTOP_GLFW", null),
49-
.rgfw => raylib.defineCMacro("PLATFORM_DESKTOP_RGFW", null),
50-
.sdl => raylib.defineCMacro("PLATFORM_DESKTOP_SDL", null),
48+
.glfw => raylib.root_module.addCMacro("PLATFORM_DESKTOP_GLFW", "1"),
49+
.rgfw => raylib.root_module.addCMacro("PLATFORM_DESKTOP_RGFW", "1"),
50+
.sdl => raylib.root_module.addCMacro("PLATFORM_DESKTOP_SDL", "1"),
5151
else => {},
5252
}
5353
}
@@ -131,7 +131,6 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
131131
try raylib_flags_arr.appendSlice(b.allocator, &[_][]const u8{
132132
"-std=gnu99",
133133
"-D_GNU_SOURCE",
134-
"-DGL_SILENCE_DEPRECATION=199309L",
135134
"-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/3674
136135
});
137136

@@ -220,7 +219,7 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
220219
}
221220

222221
if (options.opengl_version != .auto) {
223-
raylib.defineCMacro(options.opengl_version.toCMacroStr(), null);
222+
raylib.root_module.addCMacro(options.opengl_version.toCMacroStr(), "1");
224223
}
225224

226225
switch (target.result.os.tag) {
@@ -237,7 +236,7 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
237236
try c_source_files.append("src/rglfw.c");
238237

239238
if (options.linux_display_backend == .X11 or options.linux_display_backend == .Both) {
240-
raylib.defineCMacro("_GLFW_X11", null);
239+
raylib.root_module.addCMacro("_GLFW_X11", "1");
241240
raylib.linkSystemLibrary("GLX");
242241
raylib.linkSystemLibrary("X11");
243242
raylib.linkSystemLibrary("Xcursor");
@@ -257,7 +256,7 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
257256
, .{});
258257
@panic("`wayland-scanner` not found");
259258
};
260-
raylib.defineCMacro("_GLFW_WAYLAND", null);
259+
raylib.root_module.addCMacro("_GLFW_WAYLAND", "1");
261260
raylib.linkSystemLibrary("EGL");
262261
raylib.linkSystemLibrary("wayland-client");
263262
raylib.linkSystemLibrary("xkbcommon");
@@ -276,16 +275,15 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
276275
} else {
277276
if (options.opengl_version == .auto) {
278277
raylib.linkSystemLibrary("GLESv2");
279-
raylib.defineCMacro("GRAPHICS_API_OPENGL_ES2", null);
278+
raylib.root_module.addCMacro("GRAPHICS_API_OPENGL_ES2", "1");
280279
}
281280

282281
raylib.linkSystemLibrary("EGL");
283282
raylib.linkSystemLibrary("gbm");
284283
raylib.linkSystemLibrary2("libdrm", .{ .use_pkg_config = .force });
285284

286-
raylib.defineCMacro("PLATFORM_DRM", null);
287-
raylib.defineCMacro("EGL_NO_X11", null);
288-
raylib.defineCMacro("DEFAULT_BATCH_BUFFER_ELEMENT", "2048");
285+
raylib.root_module.addCMacro("PLATFORM_DRM", "1");
286+
raylib.root_module.addCMacro("EGL_NO_X11", "1");
289287
}
290288
},
291289
.freebsd, .openbsd, .netbsd, .dragonfly => {
@@ -313,6 +311,8 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
313311

314312
// On macos rglfw.c include Objective-C files.
315313
try raylib_flags_arr.append(b.allocator, "-ObjC");
314+
// Silence OpenGL deprecation warnings on macOS
315+
try raylib_flags_arr.append(b.allocator, "-DGL_SILENCE_DEPRECATION=199309L");
316316
raylib.root_module.addCSourceFile(.{
317317
.file = b.path("src/rglfw.c"),
318318
.flags = raylib_flags_arr.items,
@@ -336,9 +336,9 @@ fn compileRaylib(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.
336336
raylib.addIncludePath(dep.path("upstream/emscripten/cache/sysroot/include"));
337337
}
338338

339-
raylib.defineCMacro("PLATFORM_WEB", null);
339+
raylib.root_module.addCMacro("PLATFORM_WEB", "1");
340340
if (options.opengl_version == .auto) {
341-
raylib.defineCMacro("GRAPHICS_API_OPENGL_ES2", null);
341+
raylib.root_module.addCMacro("GRAPHICS_API_OPENGL_ES2", "1");
342342
}
343343
},
344344
else => {

0 commit comments

Comments
 (0)