Bläddra i källkod

build.zig updates for 0.11.0 release. (#3501)

Caleb Barger 1 år sedan
förälder
incheckning
ba75a7a23b
2 ändrade filer med 41 tillägg och 41 borttagningar
  1. 1 1
      build.zig
  2. 40 40
      src/build.zig

+ 1 - 1
build.zig

@@ -1,7 +1,7 @@
 const std = @import("std");
 const std = @import("std");
 const raylib = @import("src/build.zig");
 const raylib = @import("src/build.zig");
 
 
-// This has been tested to work with zig 0.11.0 (67709b6, Aug 4 2023)
+// This has been tested to work with zig 0.11.0
 pub fn build(b: *std.Build) void {
 pub fn build(b: *std.Build) void {
     raylib.build(b);
     raylib.build(b);
 }
 }

+ 40 - 40
src/build.zig

@@ -20,55 +20,55 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
         raylib.addIncludePath(.{ .path = srcdir ++ "/external/glfw/include" });
         raylib.addIncludePath(.{ .path = srcdir ++ "/external/glfw/include" });
     }
     }
 
 
-    raylib.addCSourceFiles(.{
-        .files = &.{
+    raylib.addCSourceFiles(
+        &.{
             srcdir ++ "/rcore.c",
             srcdir ++ "/rcore.c",
             srcdir ++ "/utils.c",
             srcdir ++ "/utils.c",
         },
         },
-        .flags = raylib_flags,
-    });
+        raylib_flags,
+    );
 
 
     if (options.raudio) {
     if (options.raudio) {
-        raylib.addCSourceFiles(.{
-            .files = &.{
+        raylib.addCSourceFiles(
+            &.{
                 srcdir ++ "/raudio.c",
                 srcdir ++ "/raudio.c",
             },
             },
-            .flags = raylib_flags,
-        });
+            raylib_flags,
+        );
     }
     }
     if (options.rmodels) {
     if (options.rmodels) {
-        raylib.addCSourceFiles(.{
-            .files = &.{
+        raylib.addCSourceFiles(
+            &.{
                 srcdir ++ "/rmodels.c",
                 srcdir ++ "/rmodels.c",
             },
             },
-            .flags = &[_][]const u8{
+            &[_][]const u8{
                 "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891
                 "-fno-sanitize=undefined", // https://github.com/raysan5/raylib/issues/1891
             } ++ raylib_flags,
             } ++ raylib_flags,
-        });
+        );
     }
     }
     if (options.rshapes) {
     if (options.rshapes) {
-        raylib.addCSourceFiles(.{
-            .files = &.{
+        raylib.addCSourceFiles(
+            &.{
                 srcdir ++ "/rshapes.c",
                 srcdir ++ "/rshapes.c",
             },
             },
-            .flags = raylib_flags,
-        });
+            raylib_flags,
+        );
     }
     }
     if (options.rtext) {
     if (options.rtext) {
-        raylib.addCSourceFiles(.{
-            .files = &.{
+        raylib.addCSourceFiles(
+            &.{
                 srcdir ++ "/rtext.c",
                 srcdir ++ "/rtext.c",
             },
             },
-            .flags = raylib_flags,
-        });
+            raylib_flags,
+        );
     }
     }
     if (options.rtextures) {
     if (options.rtextures) {
-        raylib.addCSourceFiles(.{
-            .files = &.{
+        raylib.addCSourceFiles(
+            &.{
                 srcdir ++ "/rtextures.c",
                 srcdir ++ "/rtextures.c",
             },
             },
-            .flags = raylib_flags,
-        });
+            raylib_flags,
+        );
     }
     }
 
 
     var gen_step = b.addWriteFiles();
     var gen_step = b.addWriteFiles();
@@ -83,10 +83,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
 
 
     switch (target.getOsTag()) {
     switch (target.getOsTag()) {
         .windows => {
         .windows => {
-            raylib.addCSourceFiles(.{
-                .files = &.{srcdir ++ "/rglfw.c"},
-                .flags = raylib_flags,
-            });
+            raylib.addCSourceFiles(
+                &.{srcdir ++ "/rglfw.c"},
+                raylib_flags,
+            );
             raylib.linkSystemLibrary("winmm");
             raylib.linkSystemLibrary("winmm");
             raylib.linkSystemLibrary("gdi32");
             raylib.linkSystemLibrary("gdi32");
             raylib.linkSystemLibrary("opengl32");
             raylib.linkSystemLibrary("opengl32");
@@ -96,10 +96,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
         },
         },
         .linux => {
         .linux => {
             if (!options.platform_drm) {
             if (!options.platform_drm) {
-                raylib.addCSourceFiles(.{
-                    .files = &.{srcdir ++ "/rglfw.c"},
-                    .flags = raylib_flags,
-                });
+                raylib.addCSourceFiles(
+                    &.{srcdir ++ "/rglfw.c"},
+                    raylib_flags,
+                );
                 raylib.linkSystemLibrary("GL");
                 raylib.linkSystemLibrary("GL");
                 raylib.linkSystemLibrary("rt");
                 raylib.linkSystemLibrary("rt");
                 raylib.linkSystemLibrary("dl");
                 raylib.linkSystemLibrary("dl");
@@ -127,10 +127,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
             }
             }
         },
         },
         .freebsd, .openbsd, .netbsd, .dragonfly => {
         .freebsd, .openbsd, .netbsd, .dragonfly => {
-            raylib.addCSourceFiles(.{
-                .files = &.{srcdir ++ "/rglfw.c"},
-                .flags = raylib_flags,
-            });
+            raylib.addCSourceFiles(
+                &.{srcdir ++ "/rglfw.c"},
+                raylib_flags,
+            );
             raylib.linkSystemLibrary("GL");
             raylib.linkSystemLibrary("GL");
             raylib.linkSystemLibrary("rt");
             raylib.linkSystemLibrary("rt");
             raylib.linkSystemLibrary("dl");
             raylib.linkSystemLibrary("dl");
@@ -149,10 +149,10 @@ pub fn addRaylib(b: *std.Build, target: std.zig.CrossTarget, optimize: std.built
             const raylib_flags_extra_macos = &[_][]const u8{
             const raylib_flags_extra_macos = &[_][]const u8{
                 "-ObjC",
                 "-ObjC",
             };
             };
-            raylib.addCSourceFiles(.{
-                .files = &.{srcdir ++ "/rglfw.c"},
-                .flags = raylib_flags ++ raylib_flags_extra_macos,
-            });
+            raylib.addCSourceFiles(
+                &.{srcdir ++ "/rglfw.c"},
+                raylib_flags ++ raylib_flags_extra_macos,
+            );
             raylib.linkFramework("Foundation");
             raylib.linkFramework("Foundation");
             raylib.linkFramework("CoreServices");
             raylib.linkFramework("CoreServices");
             raylib.linkFramework("CoreGraphics");
             raylib.linkFramework("CoreGraphics");