Maarrk/lua
1
0
Fork 0
mirror of https://github.com/allyourcodebase/lua.git synced 2026-05-01 11:17:58 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Replace deprecated functions with root_module interactions

Browse source
This commit is contained in:
PegaFox 2026-04-24 10:55:36 -04:00
parent 5a5a4135cb
commit 968b1a5b69
1 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

76
build.zig
View file

@ -26,29 +26,31 @@ pub fn build(b: *Build) !void {
const lua_src = b.dependency("lua", .{}); const lua_src = b.dependency("lua", .{});
const lib = const lib =
b.addStaticLibrary(artifactOptions( b.addLibrary(artifactOptions(
b,
.{ .shared = false }, .{ .shared = false },
.{ .target = target, .optimize = optimize }, .{ .target = target, .optimize = optimize },
)); ));
const shared = if (build_shared) const shared = if (build_shared)
b.addSharedLibrary(artifactOptions( b.addLibrary(artifactOptions(
b,
.{ .shared = true }, .{ .shared = true },
.{ .target = target, .optimize = optimize }, .{ .target = target, .optimize = optimize },
)) ))
else else
null; null;
const exe = b.addExecutable(artifactOptions(.exe, .{ const exe = b.addExecutable(artifactOptions(b, .exe, .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
})); }));
const exec = b.addExecutable(artifactOptions(.exec, .{ const exec = b.addExecutable(artifactOptions(b, .exec, .{
.target = target, .target = target,
.optimize = optimize, .optimize = optimize,
})); }));
if (!target.result.isMinGW()) { if (!target.result.isMinGW()) {
lib.linkSystemLibrary("m"); lib.root_module.linkSystemLibrary("m", .{});
exe.linkSystemLibrary("m"); exe.root_module.linkSystemLibrary("m", .{});
exec.linkSystemLibrary("m"); exec.root_module.linkSystemLibrary("m", .{});
} }
const build_targets = [_]?*Build.Step.Compile{ const build_targets = [_]?*Build.Step.Compile{
lib, lib,
@ -61,8 +63,8 @@ pub fn build(b: *Build) !void {
if (tr == null) if (tr == null)
continue; continue;
const t = tr.?; const t = tr.?;
t.linkLibC(); t.root_module.link_libc = true;
t.addIncludePath(lua_src.path("src")); t.root_module.addIncludePath(lua_src.path("src"));
switch (target.result.os.tag) { switch (target.result.os.tag) {
.aix => { .aix => {
t.root_module.addCMacro("LUA_USE_POSIX", ""); t.root_module.addCMacro("LUA_USE_POSIX", "");
@ -180,50 +182,44 @@ const ArtifactTargetOptions = struct {
target: ResolvedTarget, target: ResolvedTarget,
optimize: OptimizeMode, optimize: OptimizeMode,
}; };
fn artifactOptions(comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) { fn artifactOptions(b: *Build, comptime options: ArtifactTarget, opts: ArtifactTargetOptions) switch (options) {
.exe, .exec => Build.ExecutableOptions, .exe, .exec => Build.ExecutableOptions,
.shared => |shared| if (shared) .shared => Build.LibraryOptions
Build.SharedLibraryOptions
else
Build.StaticLibraryOptions,
} { } {
const t = opts.target.result.os.tag; const t = opts.target.result.os.tag;
return switch (options) { return switch (options) {
.shared => |shared| if (shared) blk: { .shared => |shared| if (shared and t == .windows) .{
switch (t) { .name = lib_name ++ "54",
.windows => break :blk .{ .linkage = if (shared) .dynamic else .static,
.name = lib_name ++ "54", .root_module = b.createModule(.{
.target = opts.target, .target = opts.target,
.optimize = opts.optimize, .optimize = opts.optimize,
.strip = true, .strip = true,
}, }),
else => break :blk .{ } else .{
.name = lib_name, .name = lib_name,
.target = opts.target, .linkage = if (shared) .dynamic else .static,
.optimize = opts.optimize, .root_module = b.createModule(.{
}, .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) { .exe => switch (t) {
else => .{ else => .{
.name = exe_name, .name = exe_name,
.target = opts.target, .root_module = b.createModule(.{
.optimize = opts.optimize, .target = opts.target,
.optimize = opts.optimize,
}),
}, },
}, },
.exec => switch (t) { .exec => switch (t) {
else => .{ else => .{
.name = compiler_name, .name = compiler_name,
.target = opts.target, .root_module = b.createModule(.{
.optimize = opts.optimize, .target = opts.target,
.optimize = opts.optimize,
}),
}, },
}, },
}; };