updating to zig 0.16
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,2 +1,3 @@
|
|||||||
.zig-cache/
|
.zig-cache/
|
||||||
zig-out/
|
zig-out/
|
||||||
|
zig-pkg/
|
||||||
|
|||||||
21
build.zig
21
build.zig
@@ -46,7 +46,6 @@ pub fn build(b: *Build) !void {
|
|||||||
b.installArtifact(lib);
|
b.installArtifact(lib);
|
||||||
|
|
||||||
nzigsl.linkLibrary(lib);
|
nzigsl.linkLibrary(lib);
|
||||||
docs.linkLibrary(lib);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const run_tests = b.addRunArtifact(mod_tests);
|
const run_tests = b.addRunArtifact(mod_tests);
|
||||||
@@ -116,15 +115,15 @@ fn buildNzsl(
|
|||||||
.linkage = if (shared) .dynamic else .static,
|
.linkage = if (shared) .dynamic else .static,
|
||||||
});
|
});
|
||||||
|
|
||||||
lib.addSystemIncludePath(upstream.path("include"));
|
lib.root_module.addSystemIncludePath(upstream.path("include"));
|
||||||
lib.addSystemIncludePath(upstream.path("src"));
|
lib.root_module.addSystemIncludePath(upstream.path("src"));
|
||||||
|
|
||||||
lib.addSystemIncludePath(nazaraUtils.path("include"));
|
lib.root_module.addSystemIncludePath(nazaraUtils.path("include"));
|
||||||
lib.addSystemIncludePath(frozen.path("include"));
|
lib.root_module.addSystemIncludePath(frozen.path("include"));
|
||||||
lib.addSystemIncludePath(fmt.path("include"));
|
lib.root_module.addSystemIncludePath(fmt.path("include"));
|
||||||
lib.addSystemIncludePath(ordered_map.path("include"));
|
lib.root_module.addSystemIncludePath(ordered_map.path("include"));
|
||||||
lib.addSystemIncludePath(fast_float.path("include"));
|
lib.root_module.addSystemIncludePath(fast_float.path("include"));
|
||||||
lib.addSystemIncludePath(lz4.path("lib"));
|
lib.root_module.addSystemIncludePath(lz4.path("lib"));
|
||||||
|
|
||||||
const flags = [_][]const u8{
|
const flags = [_][]const u8{
|
||||||
if (shared) "-DNZSL_DYNAMIC" else "-DNZSL_STATIC",
|
if (shared) "-DNZSL_DYNAMIC" else "-DNZSL_STATIC",
|
||||||
@@ -134,7 +133,7 @@ fn buildNzsl(
|
|||||||
"-DFMT_HEADER_ONLY",
|
"-DFMT_HEADER_ONLY",
|
||||||
};
|
};
|
||||||
|
|
||||||
lib.addCSourceFiles(.{
|
lib.root_module.addCSourceFiles(.{
|
||||||
.root = .{ .dependency = .{
|
.root = .{ .dependency = .{
|
||||||
.dependency = upstream,
|
.dependency = upstream,
|
||||||
.sub_path = "",
|
.sub_path = "",
|
||||||
@@ -143,7 +142,7 @@ fn buildNzsl(
|
|||||||
.flags = &flags,
|
.flags = &flags,
|
||||||
});
|
});
|
||||||
|
|
||||||
lib.addCSourceFiles(.{
|
lib.root_module.addCSourceFiles(.{
|
||||||
.root = .{ .dependency = .{
|
.root = .{ .dependency = .{
|
||||||
.dependency = lz4,
|
.dependency = lz4,
|
||||||
.sub_path = "lib",
|
.sub_path = "lib",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
.name = .NZSL,
|
.name = .NZSL,
|
||||||
.version = "1.1.2",
|
.version = "1.1.2",
|
||||||
.fingerprint = 0xd558585854524c37,
|
.fingerprint = 0xd558585854524c37,
|
||||||
.minimum_zig_version = "0.15.2",
|
.minimum_zig_version = "0.16.0",
|
||||||
|
|
||||||
.dependencies = .{
|
.dependencies = .{
|
||||||
.nzsl = .{
|
.nzsl = .{
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ pub const Serializer = @import("Serializer.zig");
|
|||||||
pub const SpirvWriter = @import("SpirvWriter.zig");
|
pub const SpirvWriter = @import("SpirvWriter.zig");
|
||||||
|
|
||||||
test {
|
test {
|
||||||
std.testing.refAllDeclsRecursive(@This());
|
std.testing.refAllDecls(@This());
|
||||||
}
|
}
|
||||||
|
|
||||||
test "hashOption" {
|
test "hashOption" {
|
||||||
|
|||||||
Reference in New Issue
Block a user