Update to zig 0.13

somelun · Jul 14, 2024 · d8aa90c · d8aa90c
1 parent faa1dcf
commit d8aa90c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/build.zig b/build.zig
@@ -1,23 +1,39 @@
-const Builder = @import("std").build.Builder;
+const std = @import("std");
 
-pub fn build(b: *Builder) void {
+pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
-
     const optimize = b.standardOptimizeOption(.{});
 
     const exe = b.addExecutable(.{
         .name = "nes-oddity",
-        .root_source_file = .{ .path = "src/main.zig" },
+        .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
         .link_libc = true,
     });
 
-    exe.addIncludePath(.{ .path = "/usr/local/include" });
+    exe.addLibraryPath(b.path("./lib"));
     exe.linkSystemLibrary("SDL2");
 
+    exe.addIncludePath(.{ .cwd_relative = ("/opt/homebrew/include") });
+
     b.installArtifact(exe);
 
+    exe.linkSystemLibrary("iconv");
+    exe.linkFramework("AppKit");
+    exe.linkFramework("AudioToolbox");
+    exe.linkFramework("Carbon");
+    exe.linkFramework("Cocoa");
+    exe.linkFramework("CoreAudio");
+    exe.linkFramework("CoreFoundation");
+    exe.linkFramework("CoreGraphics");
+    exe.linkFramework("CoreHaptics");
+    exe.linkFramework("CoreVideo");
+    exe.linkFramework("ForceFeedback");
+    exe.linkFramework("GameController");
+    exe.linkFramework("IOKit");
+    exe.linkFramework("Metal");
+
     const run_cmd = b.addRunArtifact(exe);
 
     run_cmd.step.dependOn(b.getInstallStep());

diff --git a/lib/libSDL2.a b/lib/libSDL2.a
diff --git a/src/cpu.zig b/src/cpu.zig
@@ -128,7 +128,7 @@ pub const CPU = struct {
             },
 
             AddressingMode.Relative => {
-                var offset: u8 = self.bus.read8(self.program_counter);
+                const offset: u8 = self.bus.read8(self.program_counter);
                 address = self.program_counter +% offset +% 1;
 
                 // if the offset is negative

diff --git a/src/main.zig b/src/main.zig
@@ -149,7 +149,7 @@ fn readScreenState(cpu: *CPU, buffer: []u24) void {
     var i: u16 = 0x0200;
     while (i < 0x0600) : (i += 1) {
         const value = cpu.bus.read8(i);
-        var color: Color = convertByteToColor(value);
+        const color: Color = convertByteToColor(value);
 
         buffer[index] = (@as(u24, color.r) << 16) + (@as(u24, color.g) << 8) + @as(u24, color.b);
         index += 1;