Skip to content

Commit 2169a52

Browse files
committed
Update to Zig 14.1
1 parent c4d525a commit 2169a52

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

build.zig

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ pub fn build(b: *Build) void {
77

88
const VVVVVV_dep = b.dependency("VVVVVV", .{});
99
const sdl_dep = switch (target.result.os.tag) {
10-
.linux => b.dependency("sdl", .{
10+
.linux => b.dependency("SDL", .{
1111
.target = target,
1212
.optimize = optimize,
1313
// doesn't support SDL_RENDERER_TARGETTEXTURE
1414
.render_driver_ogl_es = false,
1515
// doesn't support SDL_RENDERER_ACCELERATED
1616
.render_driver_software = false,
1717
}),
18-
else => b.dependency("sdl", .{
18+
else => b.dependency("SDL", .{
1919
.target = target,
2020
.optimize = optimize,
2121
// TODO: disable render_driver_software here as well if/when SDL supports it
@@ -52,8 +52,8 @@ pub fn build(b: *Build) void {
5252
{
5353
const sdl = sdl_dep.artifact("SDL2");
5454
exe.linkLibrary(sdl);
55-
const header_tree = sdl.installed_headers_include_tree orelse @panic("?");
56-
exe.addIncludePath(header_tree.getDirectory().path(b, "SDL2"));
55+
const header_tree = sdl.getEmittedIncludeTree();
56+
exe.addIncludePath(header_tree.path(b, "SDL2"));
5757
exe.linkLibrary(addFAudio(b, target, optimize, sdl));
5858
}
5959
exe.linkLibrary(addTinyXml2(b, target, optimize));
@@ -69,7 +69,7 @@ pub fn build(b: *Build) void {
6969
const out_zip_file = run_zip.addOutputFileArg("data.zip");
7070
run_zip.addDirectoryArg(makeandplay_dep.path("."));
7171
b.getInstallStep().dependOn(
72-
&b.addInstallBinFile(out_zip_file, "data.zip").step
72+
&b.addInstallBinFile(out_zip_file, "data.zip").step,
7373
);
7474
}
7575

@@ -108,7 +108,7 @@ fn addPhysfs(
108108
"src/physfs_platform_haiku.cpp",
109109
"src/physfs_platform_android.c",
110110
}) catch @panic("OOM");
111-
if (target.result.isDarwin()) {
111+
if (target.result.os.tag.isDarwin()) {
112112
files.append("src/physfs_platform_apple.m") catch @panic("OOM");
113113
}
114114
lib.addCSourceFiles(.{
@@ -123,7 +123,6 @@ fn addPhysfs(
123123
return lib;
124124
}
125125

126-
127126
fn addTinyXml2(
128127
b: *Build,
129128
target: Build.ResolvedTarget,
@@ -195,7 +194,7 @@ fn addSheenBidi(
195194
.files = &.{
196195
"Source/SheenBidi.c",
197196
},
198-
.flags = &.{ "-DSB_CONFIG_UNITY" },
197+
.flags = &.{"-DSB_CONFIG_UNITY"},
199198
});
200199
lib.installHeadersDirectory(headers_path, ".", .{});
201200
lib.linkLibCpp();
@@ -281,7 +280,7 @@ fn addLodepng(
281280
return lib;
282281
}
283282

284-
const src = [_][]const u8 {
283+
const src = [_][]const u8{
285284
"desktop_version/src/BinaryBlob.cpp",
286285
"desktop_version/src/BlockV.cpp",
287286
"desktop_version/src/ButtonGlyphs.cpp",
@@ -334,6 +333,6 @@ const src = [_][]const u8 {
334333
"desktop_version/src/Vlogging.c",
335334
"desktop_version/src/Xoshiro.c",
336335
};
337-
const physfs_src = [_][]const u8 {
336+
const physfs_src = [_][]const u8{
338337
"extras/physfsrwops.c",
339338
};

build.zig.zon

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
.{
2-
.name = "VVVVVV",
2+
.name = .VVVVVV,
33
.version = "0.0.0",
4-
.minimum_zig_version = "0.13.0",
4+
.minimum_zig_version = "0.14.1",
5+
.fingerprint = 0x34f87c4df8609942,
56
.dependencies = .{
67
.VVVVVV = .{
78
.url = "https://github.com/TerryCavanagh/VVVVVV/archive/6df7d5df8af6787e3aee1f4df6639b5aa8e3884c.tar.gz",
89
.hash = "12205a24de32aa7d0c9857320b6fb5d644b7c7af1d60dff4f5e0257881f9b0c98f3d",
910
},
10-
.sdl = .{
11-
.url = "git+https://github.com/allyourcodebase/SDL#7e4fc30b201d266f197fef4153f7e046bd189a7c",
12-
.hash = "1220c57b0bec66a2378e90cd7a79e36f9e7f60c02acca769ab3e6f974d4ef6766418",
11+
.SDL = .{
12+
.url = "git+https://github.com/allyourcodebase/SDL#005c64130effb6019c42769d3a277180bdbeb0b2",
13+
.hash = "SDL-2.32.6-JToi32yUEgFuZPcB2O6IbBHHsP2Ul8QuRYh488w2VnMy",
1314
},
1415
.physfs = .{
1516
.url = "https://github.com/icculus/physfs/archive/bfa7997c671957eb0a340ff1cf3c634e6269904a.tar.gz",
@@ -36,8 +37,8 @@
3637
.hash = "1220521ded1568db149ba4bd4e51aef847d31b760f402b6719137c1fa4b67d2c17e9",
3738
},
3839
.zipcmdline = .{
39-
.url = "https://github.com/marler8997/zipcmdline/archive/436c68f8993a355f6ef0c65b43fd7d56d06bcedc.tar.gz",
40-
.hash = "12203409341d97b9ed71926213814b88c3d3181ea944192278fc73357a2de6ca22dc",
40+
.url = "git+https://github.com/marler8997/zipcmdline#376f65b28aa02a39f7277cd36a1b8d8f170704cc",
41+
.hash = "zipcmdline-0.0.0-DFii0-FaAAAmtj5B70nXW43Ld27RctFfr7zO9EEg7tFG",
4142
},
4243
.makeandplay = .{
4344
.url = "https://thelettervsixtim.es/makeandplay/data.zip",

0 commit comments

Comments
 (0)