Skip to content

Commit 441f4ab

Browse files
author
Anthony Debucquoy
committed
Merge branch 'main' into cimgui
2 parents 68684cf + ea1380e commit 441f4ab

File tree

12 files changed

+589
-250
lines changed

12 files changed

+589
-250
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Easy to use, hand-crafted API with default arguments, named parameters and Zig s
1616

1717
## Versions
1818

19-
* [ImGui](https://github.com/ocornut/imgui/tree/v1.91.8-docking) `1.91.8-docking`
19+
* [ImGui](https://github.com/ocornut/imgui/tree/v1.91.8-docking) `1.92.1-docking`
2020
* [ImGui test engine](https://github.com/ocornut/imgui_test_engine/tree/v1.91.8) `1.91.8`
2121
* [ImPlot](https://github.com/epezent/implot) `O.17`
22-
* [ImGuizmo](https://github.com/CedricGuillemet/ImGuizmo) `1.89 WIP`
22+
* [ImGuizmo](https://github.com/CedricGuillemet/ImGuizmo) `1.91.3 WIP`
2323
* [ImGuiNodeEditor](https://github.com/thedmd/imgui-node-editor/tree/v0.9.3) `O.9.3`
2424

2525
## Getting started
@@ -115,7 +115,7 @@ defer zgui.deinit();
115115
In your shared library:
116116
```zig
117117
const zgui = @import("zgui");
118-
zgui.initNoContext(allocator);
118+
zgui.initNoContext();
119119
defer zgui.deinitNoContxt();
120120
```
121121

build.zig

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,11 @@ pub fn build(b: *std.Build) void {
446446

447447
const tests = b.addTest(.{
448448
.name = "zgui-tests",
449-
.root_source_file = b.path("src/gui.zig"),
450-
.target = target,
451-
.optimize = optimize,
449+
.root_module = b.createModule(.{
450+
.root_source_file = b.path("src/gui.zig"),
451+
.target = target,
452+
.optimize = optimize,
453+
}),
452454
});
453455
b.installArtifact(tests);
454456

build.zig.zon

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.name = .zgui,
33
.fingerprint = 0xe78160e64acbef8,
44
.version = "0.6.0-dev",
5-
.minimum_zig_version = "0.14.0",
5+
.minimum_zig_version = "0.15.1",
66
.paths = .{
77
"build.zig",
88
"build.zig.zon",
@@ -18,18 +18,18 @@
1818
.lazy = true,
1919
},
2020
.zglfw = .{
21-
.url = "https://github.com/zig-gamedev/zglfw/archive/c337cb3d3f984468ea7a386335937a5d555fc024.tar.gz",
22-
.hash = "zglfw-0.10.0-dev-zgVDNMacIQA-k7kNSfwUc9Lfzx-bb_wklVm25K-p8Tr7",
21+
.url = "https://github.com/zig-gamedev/zglfw/archive/feeeff9386dd44ba2c18488113023865c41b80a4.tar.gz",
22+
.hash = "zglfw-0.10.0-dev-zgVDNLyhIQCZR_rbIf7hnCKuifzcmPOLOQhd_hrqq8cl",
2323
.lazy = true,
2424
},
2525
.zgpu = .{
26-
.url = "https://github.com/zig-gamedev/zgpu/archive/d860e2b4a333cacffb168fab49a233c5d2f1bca2.tar.gz",
27-
.hash = "zgpu-0.12.0-dev-nqFT5EKgCADkhwAf97_pfSOmPWEguKmljSECs9ihpFS7",
26+
.url = "https://github.com/zig-gamedev/zgpu/archive/96f3ce2229e4836daec714a3f0b8c3c3218a6b2c.tar.gz",
27+
.hash = "zgpu-0.12.0-dev-nqFT5LqgCACR_1wEhi7rveY3ocKJczfRaXQoisCmpohn",
2828
.lazy = true,
2929
},
3030
.zsdl = .{
31-
.url = "https://github.com/zig-gamedev/zsdl/archive/89c1fe2d7ef5020c68e71ac574195f09fc949cce.tar.gz",
32-
.hash = "zsdl-0.4.0-dev-rFpjE5FXWQAHcbsSHDjFtbTkruSgvRVYOae6x8RXCnoM",
31+
.url = "https://github.com/zig-gamedev/zsdl/archive/a764b0ee51a157a6133007e4f423a869df9e31d7.tar.gz",
32+
.hash = "zsdl-0.4.0-dev-rFpjE2BgWQADibKkkIjv0Ig8k96MOu3Yeo6e0n9OD85L",
3333
.lazy = true,
3434
},
3535
.freetype = .{
@@ -45,5 +45,9 @@
4545
.url = "git+https://github.com/ocornut/imgui#44aa9a4b3a6f27d09a4eb5770d095cbd376dfc4b",
4646
.hash = "N-V-__8AAMSpeAAjIlPRk36GN81oqHOrwAtfmTZdOcDg42BM",
4747
},
48+
.zopengl = .{
49+
.url = "https://github.com/zig-gamedev/zopengl/archive/33ae578d91692c814e7d6b4b42573142475f68d0.tar.gz",
50+
.hash = "zopengl-0.6.0-dev-5-tnz7Y8CQCW_JRgxPCM4ETsKGOGHddqw5y1XaXhrsb4",
51+
},
4852
},
4953
}

0 commit comments

Comments
 (0)