diff --git a/.gitignore b/.gitignore index deca2cf..1da2230 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -zig-cache -zig-out +libipc.a +libipc.so .zig-cache docs *.swp diff --git a/makefile b/makefile index cd6cfa0..e3c9576 100644 --- a/makefile +++ b/makefile @@ -9,7 +9,9 @@ ZIGOPTIM ?= ReleaseSafe -include makefile.target build: - zig build -Doptimize=$(ZIGOPTIM) $(ZIGOPTS) $(TARGET_OPTION) + #zig build -Doptimize=$(ZIGOPTIM) $(ZIGOPTS) $(TARGET_OPTION) + zig build-lib -dynamic -O $(ZIGOPTIM) $(ZIGOPTS) $(TARGET_OPTION) src/ipc.zig + zig build-lib -O $(ZIGOPTIM) $(ZIGOPTS) $(TARGET_OPTION) src/ipc.zig PREFIX ?= /usr/local LIBDIR ?= $(PREFIX)/lib @@ -21,8 +23,8 @@ $(PKGCONFIGDIR)/ipc.pc: ipc.pc; install -m 0644 ipc.pc $(PKGCONFIGDIR) install-pkgconfig: $(PKGCONFIGDIR) $(PKGCONFIGDIR)/ipc.pc $(LIBDIR):; install -m 0755 -d $(LIBDIR) -$(LIBDIR)/libipc.a: zig-out/lib/libipc.a; install -m 0644 zig-out/lib/libipc.a $(LIBDIR) -$(LIBDIR)/libipc.so: zig-out/lib/libipc.so; install -m 0644 zig-out/lib/libipc.so $(LIBDIR) +$(LIBDIR)/libipc.a: libipc.a; install -m 0644 libipc.a $(LIBDIR) +$(LIBDIR)/libipc.so: libipc.so; install -m 0644 libipc.so $(LIBDIR) install-library: $(LIBDIR) $(LIBDIR)/libipc.a $(LIBDIR)/libipc.so $(INCLUDEDIR):; install -m 0755 -d $(INCLUDEDIR) diff --git a/src/bindings.zig b/src/bindings.zig index 2683bbf..24ade05 100644 --- a/src/bindings.zig +++ b/src/bindings.zig @@ -1,6 +1,6 @@ const std = @import("std"); const log = std.log.scoped(.libipc_bindings); -const ipc = @import("./main.zig"); +const ipc = @import("./ipc.zig"); const Context = ipc.Context; const Message = ipc.Message; const CBEventType = ipc.CBEvent.Type; diff --git a/src/context.zig b/src/context.zig index cdcb81e..a543bc8 100644 --- a/src/context.zig +++ b/src/context.zig @@ -22,7 +22,7 @@ const print_eq = @import("./util.zig").print_eq; const Messages = @import("./message.zig").Messages; const SwitchDB = @import("./switch.zig").SwitchDB; const Connections = @import("./connection.zig").Connections; -const CBEventType = @import("./main.zig").CBEvent.Type; +const CBEventType = @import("./ipc.zig").CBEvent.Type; pub const PollFD = std.ArrayList(posix.pollfd); diff --git a/src/main.zig b/src/ipc.zig similarity index 100% rename from src/main.zig rename to src/ipc.zig diff --git a/src/switch.zig b/src/switch.zig index b337def..cb50796 100644 --- a/src/switch.zig +++ b/src/switch.zig @@ -4,7 +4,7 @@ const fmt = std.fmt; const net = std.net; -const ipc = @import("./main.zig"); +const ipc = @import("./ipc.zig"); const Message = ipc.Message; const CBEventType = ipc.CBEvent.Type;