From 1bad7cf2ea65b0fd0cb2aaaf5b3ebbdd965b0a67 Mon Sep 17 00:00:00 2001 From: superp00t Date: Fri, 28 Jun 2024 00:15:56 -0400 Subject: [PATCH] fix(build): fix zig detection script --- build.zig | 10 ---------- zig/system.zig | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/build.zig b/build.zig index 702f99b..99de067 100644 --- a/build.zig +++ b/build.zig @@ -1,14 +1,4 @@ const std = @import("std"); const system = @import("zig/system.zig"); -// pub fn build(b: *std.Build) void { -// // const optimize = b.standardOptimizeOption(.{}); -// // const module = b.addModule(.{ -// // .name = "system", -// // .root_source_file = b.path("zig/system.zig"), -// // .optimize = optimize -// // }); -// // b.default_step.dependOn(&module.step); -// } - pub const add_defines = system.add_defines; diff --git a/zig/system.zig b/zig/system.zig index 87b7503..dbc1732 100644 --- a/zig/system.zig +++ b/zig/system.zig @@ -93,8 +93,6 @@ pub fn add_defines(b: *std.Build, compile_step: *std.Build.Step.Compile) void { var system_version = "9999"; if (isWindows) { - system_version = WHOA_WIN_UNK; - switch (t.os.version_range.semver.min.major) { 5 => { system_version = WHOA_WIN_XP; @@ -118,15 +116,15 @@ pub fn add_defines(b: *std.Build, compile_step: *std.Build.Step.Compile) void { 10 => { system_version = WHOA_WIN_10; + }, + + else => { + system_version = WHOA_WIN_UNK; } } } else if (isDarwin) { - system_version = WHOA_MAC_UNK; - switch (t.os.version_range.semver.min.major) { 10 => { - system_version = WHOA_MAC_10_8; - switch (t.os.version_range.semver.min.minor) { 8 => { system_version = WHOA_MAC_10_8; @@ -158,12 +156,20 @@ pub fn add_defines(b: *std.Build, compile_step: *std.Build.Step.Compile) void { 15 => { system_version = WHOA_MAC_10_15; + }, + + else => { + system_version = WHOA_MAC_10_8; } } }, 11 => { system_version = WHOA_MAC_11_0; + }, + + else => { + system_version = WHOA_MAC_UNK; } } } else if (isLinux) {