Skip to content

Commit

Permalink
Merge pull request #25 from Srekel/srekel-build-nominated-2024.1
Browse files Browse the repository at this point in the history
Updated zig version to 0.12.0-dev.2063+804cee3b9
  • Loading branch information
lassade authored Feb 16, 2024
2 parents 8458677 + cfb2c22 commit 05b3df3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ pub fn build(b: *std.Build) void {
.optimize = optimize,
});
lib.addIncludePath(.{ .path = "./test_cases/include" });
if (target.getAbi() == .msvc) {
if (target.result.abi == .msvc) {
lib.linkLibC();
} else {
lib.linkLibCpp();
Expand All @@ -86,8 +86,8 @@ pub fn build(b: *std.Build) void {
lib.addCSourceFile(.{ .file = .{ .path = "./test_cases/c022_cpp_string_glue.cpp" }, .flags = cflags });
test_cases.linkLibrary(lib);

const cpp_mod = b.addModule("cpp", .{ .source_file = .{ .path = "src/cpp.zig" } });
test_cases.addModule("cpp", cpp_mod);
const cpp_mod = b.addModule("cpp", .{ .root_source_file = .{ .path = "src/cpp.zig" } });
test_cases.root_module.addImport("cpp", cpp_mod);

const run_test_cases = b.addRunArtifact(test_cases);

Expand Down

0 comments on commit 05b3df3

Please sign in to comment.