From d3b68d4c361e450b2c5837b51e1dc4c488f12080 Mon Sep 17 00:00:00 2001 From: Jae B Date: Sun, 22 Sep 2024 19:44:27 +1000 Subject: [PATCH 1/4] do --- .github/workflows/ci.yml | 2 ++ src/androidbuild/tools.zig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3aad5b7..baff1c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,8 @@ jobs: include: - os: "ubuntu-22.04" - os: "windows-latest" + - os: "macos-12" # x86_64 + - os: "macos-14" # ARM runs-on: ${{matrix.os}} diff --git a/src/androidbuild/tools.zig b/src/androidbuild/tools.zig index 9dba401..745eb21 100644 --- a/src/androidbuild/tools.zig +++ b/src/androidbuild/tools.zig @@ -158,7 +158,7 @@ pub const Tools = struct { const host_os_and_arch: [:0]const u8 = switch (host_os_tag) { .windows => "windows-x86_64", .linux => "linux-x86_64", - // TODO(jae): 2024-09-15: Add MacOS support + .macos => "darwin-x86_64", else => @panic(b.fmt("unhandled operating system: {}", .{host_os_tag})), }; From e1fae6a0d8503b70be89c990faab391ba59f079b Mon Sep 17 00:00:00 2001 From: Jae B Date: Sun, 22 Sep 2024 19:44:48 +1000 Subject: [PATCH 2/4] do it --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index baff1c5..2651455 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,8 +17,8 @@ jobs: strategy: matrix: include: - - os: "ubuntu-22.04" - - os: "windows-latest" + # - os: "ubuntu-22.04" + # - os: "windows-latest" - os: "macos-12" # x86_64 - os: "macos-14" # ARM From c1d2820ccb710f3d865da3217daa67a3eaa20e43 Mon Sep 17 00:00:00 2001 From: Jae B Date: Sun, 22 Sep 2024 20:00:10 +1000 Subject: [PATCH 3/4] restore CI and fix sdl2 --- .github/workflows/ci.yml | 6 +++--- examples/sdl2/third-party/sdl2/build.zig | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2651455..092c061 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,10 +17,10 @@ jobs: strategy: matrix: include: - # - os: "ubuntu-22.04" - # - os: "windows-latest" + - os: "ubuntu-22.04" + - os: "windows-latest" - os: "macos-12" # x86_64 - - os: "macos-14" # ARM + - os: "macos-14" # arm64 as per table: https://github.com/actions/runner-images/blob/8a1eeaf6ac70c66f675a04078d1a7222edd42008/README.md#available-images runs-on: ${{matrix.os}} diff --git a/examples/sdl2/third-party/sdl2/build.zig b/examples/sdl2/third-party/sdl2/build.zig index ffc2995..1c0ad4e 100644 --- a/examples/sdl2/third-party/sdl2/build.zig +++ b/examples/sdl2/third-party/sdl2/build.zig @@ -141,7 +141,7 @@ pub fn build(b: *std.Build) !void { }); hidapi_lib.linkSystemLibrary("log"); hidapi_lib.linkLibCpp(); - lib.linkLibrary(hidapi_lib); + hidapi_lib.linkLibrary(lib); b.installArtifact(hidapi_lib); } }, From d2f5635cf903baccca800987d38d2a669a707f9a Mon Sep 17 00:00:00 2001 From: Jae B Date: Sun, 22 Sep 2024 20:05:53 +1000 Subject: [PATCH 4/4] revert --- examples/sdl2/third-party/sdl2/build.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/sdl2/third-party/sdl2/build.zig b/examples/sdl2/third-party/sdl2/build.zig index 1c0ad4e..ffc2995 100644 --- a/examples/sdl2/third-party/sdl2/build.zig +++ b/examples/sdl2/third-party/sdl2/build.zig @@ -141,7 +141,7 @@ pub fn build(b: *std.Build) !void { }); hidapi_lib.linkSystemLibrary("log"); hidapi_lib.linkLibCpp(); - hidapi_lib.linkLibrary(lib); + lib.linkLibrary(hidapi_lib); b.installArtifact(hidapi_lib); } },