diff --git a/npc/Makefile b/npc/Makefile index bc57bcc..0c5412b 100644 --- a/npc/Makefile +++ b/npc/Makefile @@ -53,9 +53,11 @@ nvboard: CXXFLAGS += -I$(NVBOARD_HOME)/include $(shell sdl2-config --cflags) -g nvboard: $(VSRC) $(CPPSRCS) $(SUBMAKE) $(SRC_AUTO_BIND) $(OBJDIR)/Vexample @NVBOARD_HOME=$(NVBOARD_HOME) $(OBJDIR)/Vexample -compile_commands.json: clean nvboard - bear -- $(MAKE) -i all > - bear -- $(MAKE) -i nvboard +compile_commands.json: clean + bear --output all.json -- $(MAKE) -i all + bear --output nvboard.json -- $(MAKE) -i nvboard + jq -s ".[0] + .[1]" all.json nvboard.json > compile_commands.json + $(RM) all.json nvboard.json clean: $(RM) -r $(PREFIX) diff --git a/npc/flake.nix b/npc/flake.nix index 3d46cc2..3eae8b3 100644 --- a/npc/flake.nix +++ b/npc/flake.nix @@ -14,6 +14,7 @@ gtkwave gcc gdb + jq bear clang-tools rnix-lsp