Skip to content

Commit

Permalink
zon: updated shdc dep
Browse files Browse the repository at this point in the history
ci: remove qemu on aarch64 target
  • Loading branch information
kassane committed Jan 20, 2025
1 parent b531649 commit 1bd3b12
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ jobs:
sudo apt-get update
sudo apt-get install libglu1-mesa-dev mesa-common-dev xorg-dev libasound-dev
- name: Install QEMU
if: endsWith(matrix.runs-on, 'arm')
run: |
sudo apt update && sudo apt install -y \
qemu-user-binfmt
- name: (Dub) Build Native
if: runner.os != 'Windows'
run: |
Expand Down
4 changes: 1 addition & 3 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ pub fn buildLibSokol(b: *Build, options: LibSokolOptions) !*CompileStep {
const imgui = try buildImgui(b, .{
.target = options.target,
.optimize = options.optimize,
.emsdk = options.emsdk,
.use_tsan = lib.root_module.sanitize_thread orelse false,
.use_ubsan = lib.root_module.sanitize_c orelse false,
});
Expand Down Expand Up @@ -940,7 +939,7 @@ fn buildShaders(b: *Build, target: Build.ResolvedTarget) void {
};
const optional_shdc: ?[:0]const u8 = comptime switch (builtin.os.tag) {
.windows => "win32/sokol-shdc.exe",
.linux => "linux/sokol-shdc",
.linux => if (builtin.cpu.arch.isX86()) "linux/sokol-shdc" else "linux_arm64/sokol-shdc",
.macos => if (builtin.cpu.arch.isX86()) "osx/sokol-shdc" else "osx_arm64/sokol-shdc",
else => null,
};
Expand Down Expand Up @@ -1154,7 +1153,6 @@ fn emSdkSetupStep(b: *Build, emsdk: *Build.Dependency) !?*Build.Step.Run {
const libImGuiOptions = struct {
target: Build.ResolvedTarget,
optimize: std.builtin.OptimizeMode,
emsdk: ?*Build.Dependency,
use_ubsan: bool = false,
use_tsan: bool = false,
};
Expand Down
4 changes: 2 additions & 2 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
.lazy = true,
},
.shdc = .{
.url = "git+https://github.com/floooh/sokol-tools-bin#d80b1d8f20fef813092ba37f26723d3880839651",
.hash = "1220f2ae16952843dd25b6bc86b888a3fd8c3f25d34adddfd8d1d2b9f801429e80e4",
.url = "git+https://github.com/floooh/sokol-tools-bin#c37e6630a1a55141d813eae2bf17b6ef93e9867c",
.hash = "122007ff9e979a63058e3af1de1d8b98957baa741a8b779d50f9b251dca4acf60b41",
.lazy = true,
},
},
Expand Down

0 comments on commit 1bd3b12

Please sign in to comment.