From 2194b84b4a464d7f04b485d4d67390af34e22941 Mon Sep 17 00:00:00 2001 From: "mcmrcs@proton.me" Date: Thu, 20 Jun 2024 21:38:49 +0100 Subject: [PATCH 1/6] build: update to zig 0.13.0 --- .gitignore | 1 + build.zig | 6 +++--- build.zig.zon | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fe95f8d..d4c2414 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /zig-* +.zig-cache diff --git a/build.zig b/build.zig index 2054160..2bb621d 100644 --- a/build.zig +++ b/build.zig @@ -16,7 +16,7 @@ pub fn build(b: *std.Build) !void { }).module("zenolith"); const mod = b.addModule("zenolith-sdl2", .{ - .root_source_file = .{ .path = "src/main.zig" }, + .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "src/main.zig" } }, .imports = &.{.{ .name = "zenolith", .module = zenolith_mod }}, .target = target, .optimize = optimize, @@ -45,7 +45,7 @@ pub fn build(b: *std.Build) !void { } const main_tests = b.addTest(.{ - .root_source_file = .{ .path = "src/main.zig" }, + .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "src/main.zig" } }, .target = target, .optimize = optimize, }); @@ -58,7 +58,7 @@ pub fn build(b: *std.Build) !void { const example_exe = b.addExecutable(.{ .name = "zenolith-sdl2-example", - .root_source_file = .{ .path = "example/main.zig" }, + .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "example/main.zig" } }, .target = target, .optimize = optimize, }); diff --git a/build.zig.zon b/build.zig.zon index aeed9ad..a7d1954 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -14,12 +14,12 @@ }, .sdl2 = .{ - .url = "git+https://git.mzte.de/mirrors/SDL.git#db4a162db2f6f59f737d03f441455dc9524d5793", - .hash = "1220c5360c9c71c215baa41b46ec18d0711059b48416a2b1cf96c7c2d87b2e8e4cf6", + .url = "git+https://git.mzte.de/mirrors/SDL.git#d3ce72923ada60041a6a4a92628408b0908ce4e0", + .hash = "1220c8b7fffe055e95a991cbaf5d86b4d5ea380294b0b4326b2ee46110613cf7972e", }, .freetype = .{ - .url = "git+https://git.mzte.de/mirrors/freetype.git#398638fd1cb723e478658ea371fe3be1a4dce0ae", - .hash = "12208c57b72e3fb5c8d5d3e667e2e21ca1d9e2b6fc3f84182b320f63933f591823da", + .url = "git+https://git.mzte.de/mirrors/freetype.git#e8c5b37f320db03acba410d993441815bc809606", + .hash = "1220babb7939707ca390b934657dfd3c8c3a6a78cc9442e4cbd43e3f9ffd49daec9e", }, }, } From df98a2cfebeb2818b81640ee156e76b8e23b2292 Mon Sep 17 00:00:00 2001 From: "mcmrcs@proton.me" Date: Sat, 22 Jun 2024 21:46:00 +0100 Subject: [PATCH 2/6] build: using b.path --- .gitignore | 2 +- build.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d4c2414..35ccb91 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ /zig-* -.zig-cache +/.zig-cache diff --git a/build.zig b/build.zig index 2bb621d..0a7e771 100644 --- a/build.zig +++ b/build.zig @@ -16,7 +16,7 @@ pub fn build(b: *std.Build) !void { }).module("zenolith"); const mod = b.addModule("zenolith-sdl2", .{ - .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "src/main.zig" } }, + .root_source_file = b.path("src/main.zig"), .imports = &.{.{ .name = "zenolith", .module = zenolith_mod }}, .target = target, .optimize = optimize, From 098abc3f703d6b00c3966327c008c842da0ec044 Mon Sep 17 00:00:00 2001 From: "mcmrcs@proton.me" Date: Sat, 22 Jun 2024 21:52:34 +0100 Subject: [PATCH 3/6] build: using b.path --- build.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig b/build.zig index 0a7e771..f05d8b8 100644 --- a/build.zig +++ b/build.zig @@ -45,7 +45,7 @@ pub fn build(b: *std.Build) !void { } const main_tests = b.addTest(.{ - .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "src/main.zig" } }, + .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, }); @@ -58,7 +58,7 @@ pub fn build(b: *std.Build) !void { const example_exe = b.addExecutable(.{ .name = "zenolith-sdl2-example", - .root_source_file = .{ .src_path = .{ .owner = b, .sub_path = "example/main.zig" } }, + .root_source_file = b.path("src/main.zig"), .target = target, .optimize = optimize, }); From 8c42cd9741bd6afa80c1a0893b512c54cf3ead6e Mon Sep 17 00:00:00 2001 From: "mcmrcs@proton.me" Date: Wed, 26 Jun 2024 20:34:15 +0100 Subject: [PATCH 4/6] build: fix root source file path --- build.zig | 2 +- build.zig.zon | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.zig b/build.zig index f05d8b8..e7bd40d 100644 --- a/build.zig +++ b/build.zig @@ -58,7 +58,7 @@ pub fn build(b: *std.Build) !void { const example_exe = b.addExecutable(.{ .name = "zenolith-sdl2-example", - .root_source_file = b.path("src/main.zig"), + .root_source_file = b.path("example/main.zig"), .target = target, .optimize = optimize, }); diff --git a/build.zig.zon b/build.zig.zon index a7d1954..9009873 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,8 +9,8 @@ .dependencies = .{ .zenolith = .{ - .url = "git+https://git.mzte.de/zenolith/zenolith.git#4e67de14b301048e73499f2ff46800b87b923609", - .hash = "1220236794547a0f13870e5c2d2b00e02571f3beee219303d2843e9aedc1b0eaf015", + .url = "git+https://git.mzte.de/coding-agent/zenolith#b5de5e14104675b76caa246a20a45f991bb9f2c1", + .hash = "1220f1e479d85174b8d07cbcd676b10ec02c06a22e36e820eff8af089b47f972829f", }, .sdl2 = .{ From 2ecd6ea9c8c126bbb6579763d27b22af907bcdc0 Mon Sep 17 00:00:00 2001 From: "mcmrcs@proton.me" Date: Wed, 26 Jun 2024 22:30:54 +0100 Subject: [PATCH 5/6] deps: update zenolith dependency --- build.zig.zon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 9009873..2e186ee 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -9,8 +9,8 @@ .dependencies = .{ .zenolith = .{ - .url = "git+https://git.mzte.de/coding-agent/zenolith#b5de5e14104675b76caa246a20a45f991bb9f2c1", - .hash = "1220f1e479d85174b8d07cbcd676b10ec02c06a22e36e820eff8af089b47f972829f", + .url = "git+https://git.mzte.de/zenolith/zenolith.git#700178d64da7883740ab68287944b38fc392e075", + .hash = "1220fa37121f4b93b6b87f7ffac98c3f0868e3eaa8c85f04142d3511df85c1cd5081", }, .sdl2 = .{ From da9f70a9b118b2be542b796a36d1334c6c8375da Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 27 Jun 2024 00:06:01 +0200 Subject: [PATCH 6/6] chore: update .gitignore for zig 0.13 --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 35ccb91..02689f6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/zig-* +/zig-out /.zig-cache