WIP: build system fix.

This commit is contained in:
Philippe Pittoli 2025-09-21 18:42:09 +02:00
parent b2e811df19
commit f2a037e247
6 changed files with 10 additions and 8 deletions

4
.gitignore vendored
View file

@ -1,5 +1,5 @@
zig-cache libipc.a
zig-out libipc.so
.zig-cache .zig-cache
docs docs
*.swp *.swp

View file

@ -9,7 +9,9 @@ ZIGOPTIM ?= ReleaseSafe
-include makefile.target -include makefile.target
build: 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 PREFIX ?= /usr/local
LIBDIR ?= $(PREFIX)/lib LIBDIR ?= $(PREFIX)/lib
@ -21,8 +23,8 @@ $(PKGCONFIGDIR)/ipc.pc: ipc.pc; install -m 0644 ipc.pc $(PKGCONFIGDIR)
install-pkgconfig: $(PKGCONFIGDIR) $(PKGCONFIGDIR)/ipc.pc install-pkgconfig: $(PKGCONFIGDIR) $(PKGCONFIGDIR)/ipc.pc
$(LIBDIR):; install -m 0755 -d $(LIBDIR) $(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.a: libipc.a; install -m 0644 libipc.a $(LIBDIR)
$(LIBDIR)/libipc.so: zig-out/lib/libipc.so; install -m 0644 zig-out/lib/libipc.so $(LIBDIR) $(LIBDIR)/libipc.so: libipc.so; install -m 0644 libipc.so $(LIBDIR)
install-library: $(LIBDIR) $(LIBDIR)/libipc.a $(LIBDIR)/libipc.so install-library: $(LIBDIR) $(LIBDIR)/libipc.a $(LIBDIR)/libipc.so
$(INCLUDEDIR):; install -m 0755 -d $(INCLUDEDIR) $(INCLUDEDIR):; install -m 0755 -d $(INCLUDEDIR)

View file

@ -1,6 +1,6 @@
const std = @import("std"); const std = @import("std");
const log = std.log.scoped(.libipc_bindings); const log = std.log.scoped(.libipc_bindings);
const ipc = @import("./main.zig"); const ipc = @import("./ipc.zig");
const Context = ipc.Context; const Context = ipc.Context;
const Message = ipc.Message; const Message = ipc.Message;
const CBEventType = ipc.CBEvent.Type; const CBEventType = ipc.CBEvent.Type;

View file

@ -22,7 +22,7 @@ const print_eq = @import("./util.zig").print_eq;
const Messages = @import("./message.zig").Messages; const Messages = @import("./message.zig").Messages;
const SwitchDB = @import("./switch.zig").SwitchDB; const SwitchDB = @import("./switch.zig").SwitchDB;
const Connections = @import("./connection.zig").Connections; 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); pub const PollFD = std.ArrayList(posix.pollfd);

View file

@ -4,7 +4,7 @@ const fmt = std.fmt;
const net = std.net; const net = std.net;
const ipc = @import("./main.zig"); const ipc = @import("./ipc.zig");
const Message = ipc.Message; const Message = ipc.Message;
const CBEventType = ipc.CBEvent.Type; const CBEventType = ipc.CBEvent.Type;