diff --git a/3rd-party/Tupfile b/3rd-party/Tupfile index f2a454f..c307e54 100644 --- a/3rd-party/Tupfile +++ b/3rd-party/Tupfile @@ -1,5 +1,5 @@ BDIR := ../build/raygui : raygui.c |> clang -c %f -o %o -I../build/raylib/include -Iraygui/src |> $(BDIR)/%B.o -: *.o |> ar crs %o %f |> $(BDIR)/lib%B.a +: $(BDIR)/*.o |> ar crs %o %f |> $(BDIR)/libraygui.a diff --git a/build.zig b/build.zig index 8fe7070..efae36f 100644 --- a/build.zig +++ b/build.zig @@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const exe = b.addExecutable(.{ - .name = "zig", + .name = "fabapp", .root_source_file = .{ .path = "src/main.zig" }, .target = target, .optimize = optimize, diff --git a/flake.nix b/flake.nix index 5c891d7..cc363a9 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ # https://flake.parts/module-arguments.html#persystem-module-parameters perSystem = { pkgs, system, ... }: { # We need unstable for Zig - _module.args.pkgs = import inputs.nixpkgs { + _module.args.pkgs = import inputs.nixpkgs-unstable { inherit system; # https://flake.parts/overlays overlays = [ inputs.zig-overlay.overlays.default ]; @@ -44,8 +44,8 @@ sqlite # Zig / webAssembly impl. - # zig - zigpkgs."0.11.0" # Issue with X11/GL libraries + zig + # zigpkgs."0.11.0" # Issue with X11/GL libraries zls emscripten diff --git a/justfile b/justfile index d6e20e6..2ffcfa2 100644 --- a/justfile +++ b/justfile @@ -11,7 +11,7 @@ pre-build: raylib: pre-build mkdir -p {{ cpp_build_dir }} cmake -B {{ cpp_build_dir }} -S {{ justfile_directory() }}/3rd-party/raylib \ - -DUSE_WAYLAND=ON -DBUILD_EXAMPLES=OFF + -DBUILD_EXAMPLES=OFF cmake --build {{ cpp_build_dir }} raygui: raylib @@ -27,7 +27,7 @@ web-build: pre-build zig build -Dtarget=wasm32-emscripten --sysroot /nix/store/lszbak7w3k1jmx3cm3qb2qzillsib71v-emscripten-3.1.24/bin/emcc # zig build -Dtarget=wasm32-emscripten -run: +run: build nixGL zig build run test: