Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use upstream facil.io #143

Open
wants to merge 1 commit into
base: zig-master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
zig-out/
zig-cache/
.zig-cache/
*.tar.gz
flake.lock.bak
tmp/
Expand Down
9 changes: 6 additions & 3 deletions build.zig
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const std = @import("std");
const build_facilio = @import("facil.io/build.zig").build_facilio;

pub fn build(b: *std.Build) !void {
const target = b.standardTargetOptions(.{});
Expand All @@ -20,14 +19,18 @@ pub fn build(b: *std.Build) !void {
break :blk false;
};

const facilio = try build_facilio("facil.io", b, target, optimize, use_openssl);
const facilio = b.dependency("facil.io", .{
.target = target,
.optimize = optimize,
.use_openssl = use_openssl,
});

const zap_module = b.addModule("zap", .{
.root_source_file = b.path("src/zap.zig"),
.target = target,
.optimize = optimize,
});
zap_module.linkLibrary(facilio);
zap_module.linkLibrary(facilio.artifact("facil.io"));

const all_step = b.step("all", "build all examples");

Expand Down
5 changes: 5 additions & 0 deletions build.zig.zon
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
.{
.name = "zap",
.version = "0.8.0",
.dependencies = .{
.@"facil.io" = .{
.path = "./facil.io",
},
},
.paths = .{
"build.zig",
"build.zig.zon",
Expand Down
20 changes: 0 additions & 20 deletions facil.io/.clang_complete

This file was deleted.

17 changes: 0 additions & 17 deletions facil.io/.travis.yml

This file was deleted.

1,111 changes: 0 additions & 1,111 deletions facil.io/CHANGELOG.md

This file was deleted.

43 changes: 0 additions & 43 deletions facil.io/CMakeLists.txt

This file was deleted.

160 changes: 0 additions & 160 deletions facil.io/CONTRIBUTING.md

This file was deleted.

Loading