diff options
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main.zig b/src/main.zig index 607b0136..4a067406 100644 --- a/src/main.zig +++ b/src/main.zig @@ -203,7 +203,9 @@ fn nativeMain(init: std.process.Init) !void { // Native shells opt into the user config; the sans-IO core and web keep // Options' null default. Read it before entering either frontend so every // builtin has run before that frontend can render its first frame. - opts.startup_config = @import("user_config.zig").load(init.io, arena, init.environ_map); + const found = @import("user_config.zig").load(init.io, arena, init.environ_map); + opts.startup_config = found.bytes; + opts.startup_config_path = found.path; switch (pardes.platform) { .tty => try @import("tty/tty.zig").run(init, opts), .gui => try @import("gui/gui.zig").run(init, opts), @@ -233,13 +235,11 @@ fn parseCtrlKey(raw: []const u8) ?u21 { // so their inline tests need naming here to exist at all. gui.zig only // compiles when it IS the shell (it @cImports SDL), hence the comptime gate; // under -Dplatform=tty this block analyses to nothing. Naming a file gets THAT -// file's tests and no further: fonts.zig is imported by both gui.zig and -// builtins.zig and still needs its own line here. +// file's tests and no further: fonts.zig is imported by gui.zig, builtins.zig +// and the macOS host, and still needs its own line here. test { _ = @import("user_config.zig"); _ = @import("allocators.zig"); - if (comptime pardes.platform == .gui) { - _ = @import("gui/gui.zig"); - _ = @import("gui/fonts.zig"); - } + if (comptime pardes.platform == .gui) _ = @import("gui/gui.zig"); + if (comptime pardes.font_picker) _ = @import("fonts.zig"); } |