mirror of
https://github.com/allyourcodebase/lua.git
synced 2026-05-01 19:27:57 +02:00
update to zig 0.15
This commit is contained in:
parent
5a5a4135cb
commit
d923b295c8
2 changed files with 36 additions and 76 deletions
104
build.zig
104
build.zig
|
|
@ -25,26 +25,44 @@ pub fn build(b: *Build) !void {
|
||||||
|
|
||||||
const lua_src = b.dependency("lua", .{});
|
const lua_src = b.dependency("lua", .{});
|
||||||
|
|
||||||
const lib =
|
const lib = b.addLibrary(.{
|
||||||
b.addStaticLibrary(artifactOptions(
|
.name = lib_name,
|
||||||
.{ .shared = false },
|
.linkage = .static,
|
||||||
.{ .target = target, .optimize = optimize },
|
.root_module = b.createModule(.{
|
||||||
));
|
.link_libc = true,
|
||||||
|
.optimize = optimize,
|
||||||
|
.target = target,
|
||||||
|
}),
|
||||||
|
});
|
||||||
const shared = if (build_shared)
|
const shared = if (build_shared)
|
||||||
b.addSharedLibrary(artifactOptions(
|
b.addLibrary(.{
|
||||||
.{ .shared = true },
|
.name = lib_name ++ "54",
|
||||||
.{ .target = target, .optimize = optimize },
|
.linkage = .dynamic,
|
||||||
))
|
.root_module = b.createModule(.{
|
||||||
|
.link_libc = true,
|
||||||
|
.optimize = optimize,
|
||||||
|
.target = target,
|
||||||
|
.strip = if (target.result.os.tag == .windows) true else null,
|
||||||
|
}),
|
||||||
|
})
|
||||||
else
|
else
|
||||||
null;
|
null;
|
||||||
const exe = b.addExecutable(artifactOptions(.exe, .{
|
const exe = b.addExecutable(.{
|
||||||
.target = target,
|
.name = exe_name,
|
||||||
|
.root_module = b.createModule(.{
|
||||||
|
.link_libc = true,
|
||||||
.optimize = optimize,
|
.optimize = optimize,
|
||||||
}));
|
|
||||||
const exec = b.addExecutable(artifactOptions(.exec, .{
|
|
||||||
.target = target,
|
.target = target,
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
const exec = b.addExecutable(.{
|
||||||
|
.name = compiler_name,
|
||||||
|
.root_module = b.createModule(.{
|
||||||
|
.link_libc = true,
|
||||||
.optimize = optimize,
|
.optimize = optimize,
|
||||||
}));
|
.target = target,
|
||||||
|
}),
|
||||||
|
});
|
||||||
if (!target.result.isMinGW()) {
|
if (!target.result.isMinGW()) {
|
||||||
lib.linkSystemLibrary("m");
|
lib.linkSystemLibrary("m");
|
||||||
exe.linkSystemLibrary("m");
|
exe.linkSystemLibrary("m");
|
||||||
|
|
@ -170,64 +188,6 @@ pub fn build(b: *Build) !void {
|
||||||
});
|
});
|
||||||
unpack_step.dependOn(&unpack_cmd.step);
|
unpack_step.dependOn(&unpack_cmd.step);
|
||||||
}
|
}
|
||||||
const ArtifactTarget = union(enum) {
|
|
||||||
// True if shared options
|
|
||||||
shared: bool,
|
|
||||||
exe,
|
|
||||||
exec,
|
|
||||||
};
|
|
||||||
const ArtifactTargetOptions = struct {
|
|
||||||
target: ResolvedTarget,
|
|
||||||
optimize: OptimizeMode,
|
|
||||||
};
|
|
||||||
fn artifactOptions(comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) {
|
|
||||||
.exe, .exec => Build.ExecutableOptions,
|
|
||||||
.shared => |shared| if (shared)
|
|
||||||
Build.SharedLibraryOptions
|
|
||||||
else
|
|
||||||
Build.StaticLibraryOptions,
|
|
||||||
} {
|
|
||||||
const t = opts.target.result.os.tag;
|
|
||||||
return switch (options) {
|
|
||||||
.shared => |shared| if (shared) blk: {
|
|
||||||
switch (t) {
|
|
||||||
.windows => break :blk .{
|
|
||||||
.name = lib_name ++ "54",
|
|
||||||
.target = opts.target,
|
|
||||||
.optimize = opts.optimize,
|
|
||||||
.strip = true,
|
|
||||||
},
|
|
||||||
else => break :blk .{
|
|
||||||
.name = lib_name,
|
|
||||||
.target = opts.target,
|
|
||||||
.optimize = opts.optimize,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
} else blk: {
|
|
||||||
switch (t) {
|
|
||||||
else => break :blk .{
|
|
||||||
.name = lib_name,
|
|
||||||
.target = opts.target,
|
|
||||||
.optimize = opts.optimize,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
.exe => switch (t) {
|
|
||||||
else => .{
|
|
||||||
.name = exe_name,
|
|
||||||
.target = opts.target,
|
|
||||||
.optimize = opts.optimize,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
.exec => switch (t) {
|
|
||||||
else => .{
|
|
||||||
.name = compiler_name,
|
|
||||||
.target = opts.target,
|
|
||||||
.optimize = opts.optimize,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const cflags = [_][]const u8{
|
const cflags = [_][]const u8{
|
||||||
"-std=gnu99",
|
"-std=gnu99",
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
.version = "5.4.7",
|
.version = "5.4.7",
|
||||||
.fingerprint = 0xd671372bcadcaace,
|
.fingerprint = 0xd671372bcadcaace,
|
||||||
|
|
||||||
.minimum_zig_version = "0.14.0",
|
.minimum_zig_version = "0.15.0",
|
||||||
|
|
||||||
.dependencies = .{
|
.dependencies = .{
|
||||||
.lua = .{
|
.lua = .{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue