diff options
| -rw-r--r-- | CHANGES | 12 | ||||
| -rw-r--r-- | build.zig | 2 | ||||
| m--------- | lib/gfz | 0 | ||||
| m--------- | lib/qoi | 0 | ||||
| m--------- | lib/zeal | 0 | ||||
| -rw-r--r-- | src/cimport.zig | 2 | ||||
| -rw-r--r-- | src/main.zig | 2 | ||||
| -rw-r--r-- | src/misc.zig | 2 |
8 files changed, 15 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES index d549660..af8462f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,19 @@ +Tag: 2.5.0 +Date: 2023-02-15 + + Zig 0.10 compatibility + + The codebase has been ported to Zig 0.10.1. + + In addition, textures have been converted from PNG to QOI, + due to the lack of a fast PNG library with nice API and linkage. + Tag: 2.4.9 Date: 2022-02-23 NPC spawning fixes - The following regressions made in 2.4.9 have been fixed: + The following regressions made in 2.4.8 have been fixed: * Weapons from previous level leaked to the next * Enemies spawned in the same block as the VIP diff --git a/build.zig b/build.zig index e16c542..846570e 100644 --- a/build.zig +++ b/build.zig @@ -33,7 +33,7 @@ pub fn build(b: *Builder) void { options.addOption([]const u8, "data_dir", data_dir); const exe = b.addExecutable("blackshades", "src/main.zig"); - exe.addIncludeDir("src"); + exe.addIncludePath("src"); const cxxflags = [_][]const u8{ "--std=c++17" }; exe.addCSourceFile("src/Decals.cpp", &cxxflags); diff --git a/lib/gfz b/lib/gfz -Subproject 7c1b42634198dbc996acf5e920e19790aebc4e0 +Subproject 22903931ddb5bae013c01ab73ebcf2dc0da5cc3 diff --git a/lib/qoi b/lib/qoi -Subproject 877af8c6440347b3f244c0dccd675be26836a74 +Subproject b928d64f4a860212e7199f714ff5df2325a1942 diff --git a/lib/zeal b/lib/zeal -Subproject 3dd7e79ff5608fdaeb53abce3acb006036dc0eb +Subproject d51c48a2525ac8a5658f019ce79488c36709e5b diff --git a/src/cimport.zig b/src/cimport.zig index 05f9537..ea29276 100644 --- a/src/cimport.zig +++ b/src/cimport.zig @@ -1,4 +1,4 @@ -usingnamespace @cImport({ +pub usingnamespace @cImport({ @cInclude("AL/al.h"); @cInclude("GL/gl.h"); @cInclude("GL/glu.h"); diff --git a/src/main.zig b/src/main.zig index 096e00e..65b7bf7 100644 --- a/src/main.zig +++ b/src/main.zig @@ -108,7 +108,7 @@ pub fn main() !void { const device = try al.Device.init(null); defer device.deinit() catch unreachable; - const context = try al.Context.init(device, &.{}); + const context = try al.Context.init(device, &.{ 0 }); defer context.deinit() catch unreachable; try context.makeCurrent(); diff --git a/src/misc.zig b/src/misc.zig index 3307713..866a33a 100644 --- a/src/misc.zig +++ b/src/misc.zig @@ -310,7 +310,7 @@ export fn loadSound(filename: [*:0]const u8) u32 { return buffer.reference; } -fn check(errorString: fn (c_uint) callconv(.C) [*c]const u8, +fn check(comptime errorString: fn (c_uint) callconv(.C) [*c]const u8, status: anytype) void { if (status != 0) @panic(span(errorString(@intCast(c_uint, status)))); |