DOOM-fire-zig icon indicating copy to clipboard operation
DOOM-fire-zig copied to clipboard

Fix compilation for 0.14.0-dev.297+464537db6

Open tgulacsi opened this issue 1 year ago • 1 comments

diff --git a/build.zig b/build.zig
index 175bc4f..0c3692b 100644
--- a/build.zig
+++ b/build.zig
@@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void {
 
     const exe = b.addExecutable(.{
         .name = "DOOM-fire",
-        .root_source_file = .{ .path = "src/main.zig" },
+        .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
     });
@@ -32,7 +32,7 @@ pub fn build(b: *std.Build) void {
 
     const exe_tests = b.addTest(.{
         .name = "exe_tests",
-        .root_source_file = .{ .path = "src/main.zig" },
+        .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
     });
diff --git a/src/main.zig b/src/main.zig
index 1d8379c..1cd5d2f 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -51,16 +51,16 @@ var stdin: std.fs.File.Reader = undefined;
 ///////////////////////////////////
 
 //// consts, vars, settings
-var rand: std.rand.Random = undefined;
+var rand: std.Random = undefined;
 
 //// functions
 
 // seed & prep for rng
 pub fn initRNG() !void {
     //rnd setup -- https://ziglearn.org/chapter-2/#random-numbers
-    var prng = std.rand.DefaultPrng.init(blk: {
+    var prng = std.Random.DefaultPrng.init(blk: {
         var seed: u64 = undefined;
-        try std.os.getrandom(std.mem.asBytes(&seed));
+        try std.posix.getrandom(std.mem.asBytes(&seed));
         break :blk seed;
     });
     rand = prng.random();
@@ -151,7 +151,7 @@ pub fn initColor() void {
 // defer freeColor(); just too lazy right now.
 
 //get terminal size given a tty
-pub fn getTermSz(tty: std.os.fd_t) !TermSz {
+pub fn getTermSz(tty: std.posix.fd_t) !TermSz {
     if (builtin.os.tag == .windows) {
         var info: win32.CONSOLE_SCREEN_BUFFER_INFO = undefined;
         if (0 == win32.GetConsoleScreenBufferInfo(tty, &info)) switch (
@@ -165,12 +165,12 @@ pub fn getTermSz(tty: std.os.fd_t) !TermSz {
         };
     }
     var winsz = c.winsize{ .ws_col = 0, .ws_row = 0, .ws_xpixel = 0, .ws_ypixel = 0 };
-    const rv = std.os.system.ioctl(tty, TIOCGWINSZ, @intFromPtr(&winsz));
-    const err = std.os.errno(rv);
+    const rv = std.os.linux.ioctl(tty, TIOCGWINSZ, @intFromPtr(&winsz));
+    const err = std.posix.errno(rv);
     if (rv == 0) {
         return TermSz{ .height = winsz.ws_row, .width = winsz.ws_col };
     } else {
-        return std.os.unexpectedErrno(err);
+        return std.posix.unexpectedErrno(err);
     }
 }
 
@@ -207,7 +207,7 @@ pub fn pause() void {
     if (b == 'q') {
         //exit cleanly
         complete();
-        std.os.exit(0);
+        std.posix.exit(0);
     }
 }
 

tgulacsi avatar Jul 15 '24 10:07 tgulacsi

thank you very much! will incorporate it into the latest build.

const-void avatar Aug 04 '24 15:08 const-void

Pending zig 0.14 release...any day now :)

const-void avatar Feb 01 '25 22:02 const-void

zig 0.14 is out! off we go :)

const-void avatar Mar 08 '25 15:03 const-void

TY for the patch.

Folded into zig-0.14 -> main/master.

zig-0.15 is created for future zig goodness.

const-void avatar Mar 09 '25 14:03 const-void