cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update build.zig for Zig-current

Browse Source
This commit is contained in:
Frank Denis 2022-10-20 14:42:14 +02:00
parent 69821eba93
commit c33ab2d45c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.zig
View File

@ -8,7 +8,7 @@ const LibExeObjStep = std.build.LibExeObjStep;
pub fn build(b: *std.build.Builder) !void { pub fn build(b: *std.build.Builder) !void {
const src_path = "src/libsodium"; const src_path = "src/libsodium";
const src_dir = try fs.Dir.openDir(fs.cwd(), src_path, .{ .iterate = true, .no_follow = true }); const src_dir = try fs.Dir.openIterableDir(fs.cwd(), src_path, .{ .no_follow = true });
var target = b.standardTargetOptions(.{}); var target = b.standardTargetOptions(.{});
var mode = b.standardReleaseOptions(); var mode = b.standardReleaseOptions();
@ -23,8 +23,8 @@ pub fn build(b: *std.build.Builder) !void {
const prebuilt_version_file_path = "builds/msvc/version.h"; const prebuilt_version_file_path = "builds/msvc/version.h";
const version_file_path = "include/sodium/version.h"; const version_file_path = "include/sodium/version.h";
if (src_dir.access(version_file_path, .{ .mode = .read_only })) {} else |_| { if (src_dir.dir.access(version_file_path, .{ .mode = .read_only })) {} else |_| {
try fs.cwd().copyFile(prebuilt_version_file_path, src_dir, version_file_path, .{}); try fs.cwd().copyFile(prebuilt_version_file_path, src_dir.dir, version_file_path, .{});
} }
for (libs) |lib| { for (libs) |lib| {
@ -36,7 +36,7 @@ pub fn build(b: *std.build.Builder) !void {
} }
lib.linkLibC(); lib.linkLibC();
lib.addIncludeDir("src/libsodium/include/sodium"); lib.addIncludePath("src/libsodium/include/sodium");
lib.defineCMacro("CONFIGURED", "1"); lib.defineCMacro("CONFIGURED", "1");
lib.defineCMacro("DEV_MODE", "1"); lib.defineCMacro("DEV_MODE", "1");
lib.defineCMacro("_GNU_SOURCE", "1"); lib.defineCMacro("_GNU_SOURCE", "1");