chaos/zar
1
0
Fork 0
Code Activity

Make the weather build flag better.

Browse source
This commit is contained in:
namedkitten 2020-07-18 14:21:45 +01:00
parent 329c946c40
commit 7cf25f7d38
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build.zig
View file

@ -23,11 +23,16 @@ pub fn build(b: *Builder) void {
"use debug allocator for testing",
) orelse false;
exe.addBuildOption(bool, "debug_allocator", debug_allocator);
const weather_location = b.option(
var weather_location = b.option(
[]const u8,
"weather_location",
"weather_location",
) orelse "\"\"";
) orelse "";
if (weather_location.len == 0) {
weather_location = "\"\"";
} else if (weather_location[0] != '"') {
weather_location = std.fmt.allocPrint(std.heap.page_allocator, "\"{}\"", .{weather_location}) catch "\"\"";
}
exe.addBuildOption([]const u8, "weather_location", weather_location);

8
src/main.zig
View file

@ -33,10 +33,10 @@ pub fn main() !void {
//&Widget.init(&textWidget.New("owo", "potato")), // 4KiB
//&Widget.init(&textWidget.New("uwu", "tomato")), // 4KiB
&Widget.init(&cpuWidget.New(&br)), // 4.08KiB
//&Widget.init(&memoryWidget.New(&br)), // 4.08KiB
//&Widget.init(&weatherWidget.New(allocator, &br, @import("build_options").weather_location)), // 16.16KiB
//&Widget.init(&batteryWidget.New(allocator, &br)), // 12.11KiB
//&Widget.init(&timeWidget.New(allocator, &br)), // 32.46KiB
&Widget.init(&memoryWidget.New(&br)), // 4.08KiB
&Widget.init(&weatherWidget.New(allocator, &br, @import("build_options").weather_location)), // 16.16KiB
&Widget.init(&batteryWidget.New(allocator, &br)), // 12.11KiB
&Widget.init(&timeWidget.New(allocator, &br)), // 32.46KiB
};
bar.widgets = widgets[0..];
try br.start();