changes

[ziglmdb] / build.zig

diff --git a/build.zig b/build.zig
index 102a4c02eb86310047baa31038e3e84db69be9bf..3e340908af596793d559fd90b8015c0a1e17716a 100644 (file)
--- a/build.zig
+++ b/build.zig
@@ -9,34 +9,28 @@ pub fn build(b: *std.Build) void {
         .target = target,
         .optimize = optimize,
     });
         .target = target,
         .optimize = optimize,
     });

-    lmdb.addIncludePath(b.path("lmdb/libraries/liblmdb"));
+    lmdb.addIncludePath(b.path("lmdb"));

     lmdb.addCSourceFiles(.{ .files = &.{
     lmdb.addCSourceFiles(.{ .files = &.{

-        "./lmdb/libraries/liblmdb/midl.c",
-        "./lmdb/libraries/liblmdb/mdb.c",
+        "./lmdb/midl.c",
+        "./lmdb/mdb.c",

     } });
     lmdb.link_libc = true;
 
     const db = b.addModule("db", .{
         .root_source_file = b.path("src/db.zig"),
     } });
     lmdb.link_libc = true;
 
     const db = b.addModule("db", .{
         .root_source_file = b.path("src/db.zig"),

+        .target = target,
+        .optimize = optimize,

     });
     db.addImport("lmdb", lmdb);
 
     const lmdb_tests = b.addTest(.{
     });
     db.addImport("lmdb", lmdb);
 
     const lmdb_tests = b.addTest(.{

-        .root_source_file = b.path("src/lmdb.zig"),
-        .target = target,
-        .optimize = optimize,
+        .root_module = lmdb,

     });
     });

-    lmdb_tests.addIncludePath(b.path("lmdb/libraries/liblmdb"));
-    lmdb_tests.addCSourceFiles(.{ .files = &.{
-        "./lmdb/libraries/liblmdb/midl.c",
-        "./lmdb/libraries/liblmdb/mdb.c",
-    } });
+    lmdb_tests.addIncludePath(b.path("lmdb"));

     lmdb_tests.linkLibC();
 
     const db_tests = b.addTest(.{
     lmdb_tests.linkLibC();
 
     const db_tests = b.addTest(.{

-        .root_source_file = b.path("src/db.zig"),
-        .target = target,
-        .optimize = optimize,
+        .root_module = db,

     });
     db_tests.root_module.addImport("lmdb", lmdb);
 
     });
     db_tests.root_module.addImport("lmdb", lmdb);
 


@@ -54,4 +48,8 @@ pub fn build(b: *std.Build) void {
     test_step.dependOn(&db_tests.step);
     test_step.dependOn(&lmdb_test_bin.step);
     test_step.dependOn(&db_test_bin.step);
     test_step.dependOn(&db_tests.step);
     test_step.dependOn(&lmdb_test_bin.step);
     test_step.dependOn(&db_test_bin.step);

+
+    const check = b.step("check", "Check if ziglmdb compiles");
+    check.dependOn(&lmdb_tests.step);
+    check.dependOn(&db_tests.step);

 }
 }