Skip to content

Commit d40ce7c

Browse files
committed
simplify build.zig
1 parent c6dc314 commit d40ce7c

File tree

1 file changed

+12
-74
lines changed

1 file changed

+12
-74
lines changed

build.zig

Lines changed: 12 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -45,98 +45,36 @@ pub fn build(b: *std.Build) void {
4545

4646
fn build_webui(b: *Build, optimize: OptimizeMode, target: CrossTarget, is_static: bool, enable_tls: bool) *Compile {
4747
const name = "webui";
48-
const webui = if (is_static) b.addStaticLibrary(.{
49-
.name = name,
50-
.target = target,
51-
.optimize = optimize,
52-
}) else b.addSharedLibrary(.{
53-
.name = name,
54-
.target = target,
55-
.optimize = optimize,
56-
});
48+
const webui = if (is_static) b.addStaticLibrary(.{ .name = name, .target = target, .optimize = optimize }) else b.addSharedLibrary(.{ .name = name, .target = target, .optimize = optimize });
5749

5850
webui.addCSourceFile(.{
59-
.file = .{
60-
.path = "src/webui.c",
61-
},
51+
.file = .{ .path = "src/webui.c" },
6252
.flags = if (enable_tls)
63-
&[_][]const u8{
64-
"-DNO_SSL",
65-
"-DWEBUI_TLS",
66-
"-DNO_SSL_DL",
67-
"-DOPENSSL_API_1_1",
68-
}
53+
&[_][]const u8{ "-DNO_SSL", "-DWEBUI_TLS", "-DNO_SSL_DL", "-DOPENSSL_API_1_1" }
6954
else
70-
&[_][]const u8{
71-
"-DNO_SSL",
72-
},
55+
&[_][]const u8{"-DNO_SSL"},
7356
});
7457

7558
webui.linkLibC();
7659

77-
webui.addIncludePath(.{
78-
.path = "include",
79-
});
60+
webui.addIncludePath(.{ .path = "include" });
8061

8162
return webui;
8263
}
8364

8465
fn build_civetweb(b: *Build, optimize: OptimizeMode, target: CrossTarget, is_static: bool, enable_tls: bool) *Compile {
8566
const name = "civetweb";
86-
const civetweb = if (is_static) b.addStaticLibrary(.{
87-
.name = name,
88-
.target = target,
89-
.optimize = optimize,
90-
}) else b.addSharedLibrary(.{
91-
.name = name,
92-
.target = target,
93-
.optimize = optimize,
94-
});
67+
const civetweb = if (is_static) b.addStaticLibrary(.{ .name = name, .target = target, .optimize = optimize }) else b.addSharedLibrary(.{ .name = name, .target = target, .optimize = optimize });
9568

96-
civetweb.addIncludePath(.{
97-
.path = "include",
98-
});
69+
civetweb.addIncludePath(.{ .path = "include" });
9970

100-
const cflags = if (target.os_tag == .windows and !enable_tls) &[_][]const u8{
101-
"-DNO_SSL",
102-
"-DNDEBUG",
103-
"-DNO_CACHING",
104-
"-DNO_CGI",
105-
"-DUSE_WEBSOCKET",
106-
"-DMUST_IMPLEMENT_CLOCK_GETTIME",
107-
} else if (target.os_tag == .windows and enable_tls) &[_][]const u8{
108-
"-DNDEBUG",
109-
"-DNO_CACHING",
110-
"-DNO_CGI",
111-
"-DUSE_WEBSOCKET",
112-
"-DWEBUI_TLS",
113-
"-DNO_SSL_DL",
114-
"-DOPENSSL_API_1_1",
115-
"-DMUST_IMPLEMENT_CLOCK_GETTIME",
116-
} else if (target.os_tag != .windows and enable_tls)
117-
&[_][]const u8{
118-
"-DNDEBUG",
119-
"-DNO_CACHING",
120-
"-DNO_CGI",
121-
"-DUSE_WEBSOCKET",
122-
"-DWEBUI_TLS",
123-
"-DNO_SSL_DL",
124-
"-DOPENSSL_API_1_1",
125-
}
126-
else
127-
&[_][]const u8{
128-
"-DNO_SSL",
129-
"-DNDEBUG",
130-
"-DNO_CACHING",
131-
"-DNO_CGI",
132-
"-DUSE_WEBSOCKET",
133-
};
71+
const extra_flags = if (target.os_tag == .windows) "-DMUST_IMPLEMENT_CLOCK_GETTIME" else "";
72+
73+
const cflags = if (enable_tls) [_][]const u8{ "-DNDEBUG", "-DNO_CACHING", "-DNO_CGI", "-DUSE_WEBSOCKET", "-DWEBUI_TLS", "-DNO_SSL_DL", "-DOPENSSL_API_1_1", extra_flags } else [_][]const u8{ "-DNDEBUG", "-DNO_CACHING", "-DNO_CGI", "-DUSE_WEBSOCKET", "-DNO_SSL", extra_flags, "", "" };
13474

13575
civetweb.addCSourceFile(.{
136-
.file = .{
137-
.path = "src/civetweb/civetweb.c",
138-
},
139-
.flags = cflags,
76+
.file = .{ .path = "src/civetweb/civetweb.c" },
77+
.flags = &cflags,
14078
});
14179

14280
civetweb.linkLibC();

0 commit comments

Comments
 (0)