Skip to content

Commit 613d847

Browse files
hazeycodehazeycode
authored
Merge pull request #718 from zig-gamedev/zig-0.14.0
Upgrade Zig to new Mach nominated ver 0.14.0-dev.1911+3bf89f55c
2 parents f48e78d + 4d7d629 commit 613d847

File tree

94 files changed

+954
-805
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+954
-805
lines changed

‎.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ubuntu-latest, macos-latest, windows-latest]
18+
os: [ubuntu-latest, windows-latest]
1919
runs-on: ${{matrix.os}}
2020
steps:
2121
- name: Checkout repository

‎.zigversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.13.0-dev.351+64ef45eb0
1+
0.14.0-dev.1911+3bf89f55c

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Note: If using Git then you will need [Git LFS](https://git-lfs.github.com/) to
2424

2525
### Get Zig
2626

27-
Our [main](https://github.com/zig-gamedev/zig-gamedev/tree/main) branch is currenly tracking Zig **0.13.0-dev.351+64ef45eb0**. Or you can use the **unstable** [zig-0.14.0 branch](https://github.com/zig-gamedev/zig-gamedev/tree/zig-0.14.0).
27+
Our [main](https://github.com/zig-gamedev/zig-gamedev/tree/main) branch is currenly tracking Zig **0.14.0-dev.1911+8ee52f99c**. Or you can use the **unstable** [zig-0.14.0 branch](https://github.com/zig-gamedev/zig-gamedev/tree/zig-0.14.0) for newer versions.
2828

2929
[zigup](https://github.com/marler8997/zigup) is recommended for managing compiler versions. To switch to the compiler version after branch checkout:
3030
```sh
@@ -35,10 +35,10 @@ Alternatively, you can download and install manually using the links below:
3535

3636
| OS/Arch | Download link |
3737
| --------------- | --------------------------- |
38-
| Windows x86_64 | [zig-windows-x86_64-0.13.0-dev.351+64ef45eb0.zip](https://pkg.machengine.org/zig/zig-windows-x86_64-0.13.0-dev.351+64ef45eb0.zip) |
39-
| Linux x86_64 | [zig-linux-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz](https://pkg.machengine.org/zig/zig-linux-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz) |
40-
| macOS x86_64 | [zig-macos-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz](https://pkg.machengine.org/zig/zig-macos-x86_64-0.13.0-dev.351+64ef45eb0.tar.xz) |
41-
| macOS aarch64 | [zig-macos-aarch64-0.13.0-dev.351+64ef45eb0.tar.xz](https://pkg.machengine.org/zig/zig-macos-aarch64-0.13.0-dev.351+64ef45eb0.tar.xz) |
38+
| Windows x86_64 | [zig-windows-x86_64-0.14.0-dev.1911+8ee52f99c.zip](https://pkg.machengine.org/zig/zig-windows-x86_64-0.14.0-dev.1911+8ee52f99c.zip) |
39+
| Linux x86_64 | [zig-linux-x86_64-0.14.0-dev.1911+8ee52f99c.tar.xz](https://pkg.machengine.org/zig/zig-linux-x86_64-0.14.0-dev.1911+8ee52f99c.tar.xz) |
40+
| macOS x86_64 | [zig-macos-x86_64-0.14.0-dev.1911+8ee52f99c.tar.xz](https://pkg.machengine.org/zig/zig-macos-x86_64-0.14.0-dev.1911+8ee52f99c.tar.xz) |
41+
| macOS aarch64 | [zig-macos-aarch64-0.14.0-dev.1911+8ee52f99c.tar.xz](https://pkg.machengine.org/zig/zig-macos-aarch64-0.14.0-dev.1911+8ee52f99c.tar.xz) |
4242

4343
### Build and run the [Samples](#sample-applications-native-wgpu)
4444

‎build.zig

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ const std = @import("std");
33

44
pub const min_zig_version = std.SemanticVersion{
55
.major = 0,
6-
.minor = 13,
6+
.minor = 14,
77
.patch = 0,
8-
.pre = "dev.351",
8+
.pre = "dev.1911",
99
};
1010

1111
pub fn build(b: *std.Build) void {
@@ -141,9 +141,11 @@ pub const samples_cross_platform = struct {
141141
pub const instanced_pills_wgpu = @import("samples/instanced_pills_wgpu/build.zig");
142142
pub const layers_wgpu = @import("samples/layers_wgpu/build.zig");
143143
pub const minimal_zgpu_zgui = @import("samples/minimal_zgpu_zgui/build.zig");
144-
pub const monolith = @import("samples/monolith/build.zig");
144+
// TODO(hazeycode): Get monolith building again. See https://github.com/zig-gamedev/zig-gamedev/pull/718
145+
//pub const monolith = @import("samples/monolith/build.zig");
145146
pub const physically_based_rendering_wgpu = @import("samples/physically_based_rendering_wgpu/build.zig");
146-
pub const physics_test_wgpu = @import("samples/physics_test_wgpu/build.zig");
147+
// TODO(hazeycode): Get monolith building again. See https://github.com/zig-gamedev/zig-gamedev/pull/718
148+
//pub const physics_test_wgpu = @import("samples/physics_test_wgpu/build.zig");
147149
pub const procedural_mesh_wgpu = @import("samples/procedural_mesh_wgpu/build.zig");
148150
pub const textured_quad_wgpu = @import("samples/textured_quad_wgpu/build.zig");
149151
pub const triangle_wgpu = @import("samples/triangle_wgpu/build.zig");

‎build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.{
22
.name = "zig-gamedev",
33
.version = "0.6.0",
4-
.minimum_zig_version = "0.13.0-dev.351+64ef45eb0",
4+
.minimum_zig_version = "0.14.0",
55
.paths = .{
66
"build.zig",
77
"build.zig.zon",

‎experiments/genart/src/x0001.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub const display_height = 1024 * 1;
1111
const Vec2 = [2]f32;
1212
const bounds: f32 = 3.0;
1313

14-
var prng = std.rand.DefaultPrng.init(123);
14+
var prng = std.Random.DefaultPrng.init(123);
1515
var random = prng.random();
1616
var pass: u32 = 0;
1717
var y: f32 = -bounds;

‎experiments/genart/src/x0002.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub const display_height = 1024 * 1;
1111
const Vec2 = [2]f32;
1212
const bounds: f32 = 3.0;
1313

14-
var prng = std.rand.DefaultPrng.init(0);
14+
var prng = std.Random.DefaultPrng.init(0);
1515
var random = prng.random();
1616
var pass: u32 = 0;
1717
var y: f32 = -bounds;

‎experiments/genart/src/x0010.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub const display_height = 1024 * 1;
1010

1111
var fs_postprocess: gl.Uint = 0;
1212
var angle: f32 = 0.0;
13-
var prng = std.rand.DefaultPrng.init(123);
13+
var prng = std.Random.DefaultPrng.init(123);
1414
var random = prng.random();
1515

1616
const Particle = struct {

‎experiments/genart/src/x0011.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub const display_width = 1024 * 1;
99
pub const display_height = 1024 * 1;
1010

1111
var fs_postprocess: gl.Uint = 0;
12-
var prng = std.rand.DefaultPrng.init(123);
12+
var prng = std.Random.DefaultPrng.init(123);
1313
var random = prng.random();
1414

1515
const Particle = struct {

‎experiments/genart/src/x0012.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub const display_width = 1024 * 1;
99
pub const display_height = 1024 * 1;
1010

1111
var fs_postprocess: gl.Uint = 0;
12-
var prng = std.rand.DefaultPrng.init(123);
12+
var prng = std.Random.DefaultPrng.init(123);
1313
var random = prng.random();
1414

1515
const Particle = struct {

0 commit comments

Comments
 (0)