Skip to content

Commit 1c7e0c6

Browse files
committed
Upgrade zig to 0.14.0-dev.2577+271452d22 aka 2024.11.0-mach
1 parent 6267068 commit 1c7e0c6

File tree

9 files changed

+24
-21
lines changed

9 files changed

+24
-21
lines changed

.github/workflows/test.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ jobs:
7575
with:
7676
submodules: true
7777

78+
- if: matrix.os == 'linux-large'
79+
run: sudo apt update && sudo apt install libnx-x11
80+
7881
- name: Read .zig-version
7982
id: zigversion
8083
uses: juliangruber/read-file-action@v1

.zigversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.14.0-dev.1911+3bf89f55c
1+
2024.11.0-mach

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Zig binding is licensed by [WTFPL](LICENSE)
3737

3838
## Zig version
3939

40-
Minimal is `0.14.0-dev.1911+3bf89f55c`. But you know try your version and believe.
40+
Minimal is `0.14.0-dev.2577+271452d22` a.k.a `2024.11.0-mach`. But you know try your version and believe.
4141

4242
## Bgfx version
4343

build.zig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ pub fn build(b: *std.Build) !void {
127127
bgfx.linkLibrary(bx);
128128
bgfx.linkLibrary(bimg);
129129

130-
bgfx.defineCMacro("BGFX_CONFIG_MULTITHREADED", if (options.multithread) "1" else "0");
130+
bgfx.root_module.addCMacro("BGFX_CONFIG_MULTITHREADED", if (options.multithread) "1" else "0");
131131

132132
bgfx.addIncludePath(b.path("includes"));
133133

@@ -138,8 +138,8 @@ pub fn build(b: *std.Build) !void {
138138
bgfx.linkFramework("IOKit");
139139
bgfx.linkFramework("OpenGL");
140140
bgfx.linkFramework("QuartzCore");
141-
bgfx.linkFrameworkWeak("Metal");
142-
bgfx.linkFrameworkWeak("MetalKit");
141+
bgfx.linkFramework("Metal");
142+
bgfx.linkFramework("MetalKit");
143143

144144
bgfx.addCSourceFiles(.{
145145
.flags = &mm_options,
@@ -548,11 +548,11 @@ pub fn build(b: *std.Build) !void {
548548
}
549549

550550
fn bxInclude(b: *std.Build, step: *std.Build.Step.Compile, target: std.Build.ResolvedTarget, optimize: std.builtin.OptimizeMode) void {
551-
step.defineCMacro("__STDC_LIMIT_MACROS", null);
552-
step.defineCMacro("__STDC_FORMAT_MACROS", null);
553-
step.defineCMacro("__STDC_CONSTANT_MACROS", null);
551+
step.root_module.addCMacro("__STDC_LIMIT_MACROS", "1");
552+
step.root_module.addCMacro("__STDC_FORMAT_MACROS", "1");
553+
step.root_module.addCMacro("__STDC_CONSTANT_MACROS", "1");
554554

555-
step.defineCMacro("BX_CONFIG_DEBUG", if (optimize == .Debug) "1" else "0");
555+
step.root_module.addCMacro("BX_CONFIG_DEBUG", if (optimize == .Debug) "1" else "0");
556556

557557
switch (target.result.os.tag) {
558558
.freebsd => step.addIncludePath(b.path("libs/bx/include/compat/freebsd")),

examples/00-minimal/src/main.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pub fn main() anyerror!u8 {
9696
//
9797
// Create window
9898
//
99-
zglfw.windowHintTyped(.client_api, .no_api);
99+
zglfw.windowHint(.client_api, .no_api);
100100
const window = try zglfw.Window.create(WIDTH, HEIGHT, "ZBgfx - minimal", null);
101101
defer window.destroy();
102102
window.setSizeLimits(400, 400, -1, -1);

examples/01-zgui/src/main.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn main() anyerror!u8 {
3838
//
3939
// Create window
4040
//
41-
zglfw.windowHintTyped(.client_api, .no_api);
41+
zglfw.windowHint(.client_api, .no_api);
4242
const window = try zglfw.Window.create(WIDTH, HEIGHT, "ZBgfx - zgui", null);
4343
defer window.destroy();
4444
window.setSizeLimits(400, 400, -1, -1);

examples/02-runtime-shaderc/src/main.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub fn main() anyerror!u8 {
140140
//
141141
// Create window
142142
//
143-
zglfw.windowHintTyped(.client_api, .no_api);
143+
zglfw.windowHint(.client_api, .no_api);
144144
const window = try zglfw.Window.create(WIDTH, HEIGHT, "ZBgfx - runtime shaderc", null);
145145
defer window.destroy();
146146
window.setSizeLimits(400, 400, -1, -1);

examples/03-debugdraw/src/main.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub fn main() anyerror!u8 {
3535
//
3636
// Create window
3737
//
38-
zglfw.windowHintTyped(.client_api, .no_api);
38+
zglfw.windowHint(.client_api, .no_api);
3939
const window = try zglfw.Window.create(WIDTH, HEIGHT, "ZBgfx - debugdraw", null);
4040
defer window.destroy();
4141
window.setSizeLimits(400, 400, -1, -1);

examples/build.zig.zon

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
.zbgfx = .{ .path = "../" },
1111

1212
.zglfw = .{
13-
.url = "https://github.com/zig-gamedev/zglfw/archive/d18b30438d630d44e50aa30e2300a96c4f4ff67d.tar.gz",
14-
.hash = "1220074231fcf6556b27e0ac6a3b22a19062c0c4bc3fd77c6fdcede15303af824c27",
13+
.url = "https://github.com/zig-gamedev/zglfw/archive/1c8f7de20bb01076c94582e22d9393a8d6bf30fe.tar.gz",
14+
.hash = "1220aac39fd472cb7a70b1987249f3ac73799e702ff27516d799e1d5e566097f0a8b",
1515
},
1616

17-
.zmath = .{
18-
.url = "https://github.com/zig-gamedev/zmath/archive/fb075f0f2f90d6d938a5959a3a79700cdec155c2.tar.gz",
19-
.hash = "1220081d55b58b968d953db1afc2fb01b2f5733929144e69522461ce25fa6450d84e",
17+
.zgui = .{
18+
.url = "https://github.com/zig-gamedev/zgui/archive/c16629e67e7bc1bca9a5c67d5123874c75f5374d.tar.gz",
19+
.hash = "12202063c813c1b95affa57d83a6a4817d9a4114bd9db052f87740f81b1843ceca09",
2020
},
2121

22-
.zgui = .{
23-
.url = "https://github.com/zig-gamedev/zgui/archive/d23ed60a659d8c9c6d664b2e9bd78fae1675154e.tar.gz",
24-
.hash = "1220ffffdf1d0d2aca86a1ea31ba17ee48090b38cefb2a8487d2d801eb1fdd78becb",
22+
.zmath = .{
23+
.url = "https://github.com/zig-gamedev/zmath/archive/f40bb8a935b4878c707c3fccfd5c234cfcb43bf2.tar.gz",
24+
.hash = "1220c1ab7d1e49106f59c6adb4004befdb95525a72056364a663757aaa1365aae64a",
2525
},
2626
},
2727
}

0 commit comments

Comments
 (0)