Skip to content

Commit d1d86b5

Browse files
authored
Merge pull request #192 from Queyrouzec/master
2 parents dc64c7c + d34b697 commit d1d86b5

File tree

1 file changed

+29
-28
lines changed

1 file changed

+29
-28
lines changed

build.zig

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -176,33 +176,35 @@ pub fn build(b: *std.Build) !void {
176176
// Main library and module
177177
//
178178

179-
//\ const sqlite_lib, const sqlite_mod = blk: {
180-
//\ const lib = makeSQLiteLib(b, sqlite_dep, c_flags, target, optimize, .with);
181-
//\
182-
//\ const mod = b.addModule("sqlite", .{
183-
//\ .root_source_file = b.path("sqlite.zig"),
184-
//\ .link_libc = true,
185-
//\ });
186-
//\ mod.addIncludePath(b.path("c"));
187-
//\ mod.addIncludePath(sqlite_dep.path("."));
188-
//\ mod.linkLibrary(lib);
189-
//\
190-
//\ break :blk .{ lib, mod };
191-
//\ };
192-
//\ b.installArtifact(sqlite_lib);
193-
//\
194-
//\ const sqliteext_mod = blk: {
195-
//\ const lib = makeSQLiteLib(b, sqlite_dep, c_flags, target, optimize, .without);
196-
//\
197-
//\ const mod = b.addModule("sqliteext", .{
198-
//\ .root_source_file = b.path("sqlite.zig"),
199-
//\ .link_libc = true,
200-
//\ });
201-
//\ mod.addIncludePath(b.path("c"));
202-
//\ mod.linkLibrary(lib);
203-
//\
204-
//\ break :blk mod;
205-
//\ };
179+
// const sqlite_lib, const sqlite_mod = blk: {
180+
const sqlite_lib, _ = blk: {
181+
const lib = makeSQLiteLib(b, sqlite_dep, c_flags, target, optimize, .with);
182+
183+
const mod = b.addModule("sqlite", .{
184+
.root_source_file = b.path("sqlite.zig"),
185+
.link_libc = true,
186+
});
187+
mod.addIncludePath(b.path("c"));
188+
mod.addIncludePath(sqlite_dep.path("."));
189+
mod.linkLibrary(lib);
190+
191+
break :blk .{ lib, mod };
192+
};
193+
b.installArtifact(sqlite_lib);
194+
195+
// const sqliteext_mod = blk: {
196+
_ = blk: {
197+
const lib = makeSQLiteLib(b, sqlite_dep, c_flags, target, optimize, .without);
198+
199+
const mod = b.addModule("sqliteext", .{
200+
.root_source_file = b.path("sqlite.zig"),
201+
.link_libc = true,
202+
});
203+
mod.addIncludePath(b.path("c"));
204+
mod.linkLibrary(lib);
205+
206+
break :blk mod;
207+
};
206208

207209
//
208210
// Tests
@@ -258,7 +260,6 @@ pub fn build(b: *std.Build) !void {
258260

259261
//\ const zigcrypto_install_artifact = addZigcrypto(b, sqliteext_mod, target, optimize);
260262
//\ test_step.dependOn(&zigcrypto_install_artifact.step);
261-
//\
262263
//\ const zigcrypto_test_run = addZigcryptoTestRun(b, sqlite_mod, target, optimize);
263264
//\ zigcrypto_test_run.step.dependOn(&zigcrypto_install_artifact.step);
264265
//\ test_step.dependOn(&zigcrypto_test_run.step);

0 commit comments

Comments
 (0)