Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated zig version to 0.12.0-dev.2063+804cee3b9 #25

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Updated zig version to 0.12.0-dev.2063+804cee3b9 #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.zig
View file
Open in desktop
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
Loading