From 0b136091e05fd2e2d8992990ca4209bd3771adf5 Mon Sep 17 00:00:00 2001 From: Alexander M Pickering Date: Sun, 17 Sep 2023 17:09:39 -0500 Subject: Update makefiles --- Makefile | 1 + Makefile.nix | 4 +++- Makefile.shared | 6 +----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 62137a4..6ff665a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ +.DEFAULT_GOAL := all #Detect what kind of system we're on ifeq ($(OS), Windows_NT) UNAME:=Windows diff --git a/Makefile.nix b/Makefile.nix index bd066c2..cc3a35f 100644 --- a/Makefile.nix +++ b/Makefile.nix @@ -1,8 +1,8 @@ +MDOC=mdoc include Makefile.shared -MDOC=mdoc shared_objs=$(SHARED_SRC:src/shared/%=build/shared/%.o) client_objs=$(CLIENT_SRC:src/client/%=build/client/%.o) @@ -39,6 +39,8 @@ CLIENT_LIBS=\ -lLinearMath\ -lnng\ +CFLAGS += -Ilib/luajit/src -Ilib/irrlicht/include -Isrc -Ilib/bulletminus/src -Ilib/tinyobjloader-c -Ilib/nng/include + doc: documentation documentation: diff --git a/Makefile.shared b/Makefile.shared index a2429c5..c66158f 100644 --- a/Makefile.shared +++ b/Makefile.shared @@ -74,13 +74,9 @@ else LDFLAGS += # and -static on linux prevents dynamic linking of things like libGL which must be dynamic endif -.PHONY: doc documentation test +.PHONY: doc documentation doc: documentation documentation: $(MDOC) -p src -o doc -t "Brok[en]gine" -i README.md -d reference -m "markdown" - -test: - busted - -- cgit v1.2.3-70-g09d2