Skip to content
Merged
Changes from all commits
Commits
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
28 changes: 24 additions & 4 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pub fn build(b: *Build) !void {
log(.info, .WebUI, "Done.", .{});
}

const webui = if (is_dynamic) b.addSharedLibrary(.{
const webui = if (builtin.zig_version.minor == 14) (if (is_dynamic) b.addSharedLibrary(.{
.name = lib_name,
.target = target,
.optimize = optimize,
Expand All @@ -52,7 +52,18 @@ pub fn build(b: *Build) !void {
.name = lib_name,
.target = target,
.optimize = optimize,
})) else b.addLibrary(.{
.name = lib_name,
.linkage = if (is_dynamic) .dynamic else .static,
.root_module = b.createModule(.{
// not, pic enabled, zig will not allow to build a static library
// .pic = is_dynamic,
.pic = if (is_dynamic) is_dynamic else true,
.target = target,
.optimize = optimize,
}),
});

try addLinkerFlags(b, webui, enable_tls, debug_dependencies, enable_webui_log);

b.installArtifact(webui);
Expand Down Expand Up @@ -132,10 +143,12 @@ fn addLinkerFlags(
for (webui.root_module.link_objects.items) |lo| {
switch (lo) {
.c_source_file => |csf| {
log(.debug, .WebUI, "{s} linker flags: {s}", .{
log(.debug, .WebUI, "{s} linker flags:\n", .{
csf.file.src_path.sub_path,
csf.flags,
});
for (csf.flags) |flag| {
log(.debug, .WebUI, " {s}", .{flag});
}
Comment on lines +146 to +151

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

},
else => {},
}
Expand Down Expand Up @@ -165,10 +178,17 @@ fn build_examples(b: *Build, webui: *Compile) !void {
}
const example_name = val.name;

const exe = b.addExecutable(.{
const exe = b.addExecutable(if (builtin.zig_version.minor == 14) .{
.name = example_name,
.target = target,
.optimize = optimize,
} else .{
.name = example_name,
.root_module = b.createModule(.{
.target = target,
.optimize = optimize,
.pic = true,
}),
});
const path = try std.fmt.allocPrint(b.allocator, "examples/C/{s}/main.c", .{example_name});
defer b.allocator.free(path);
Expand Down
Loading