Upgrade DarkPlaces Engine

[xonotic/xonotic.git] / Makefile

diff --git a/Makefile b/Makefile
index 0b8b752147bd1fab4e0e4fb2b694a53bd8c6c2ec..1ab3dc2b10f2904dd6810c1f042321e7266ac71a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,10 @@ CLIENT = xonotic-local-sdl
 SERVER = xonotic-local-dedicated
 
 # CC and MAKEFLAGS are always set so ?= has no effect, therefore
-# use CFLAGS to set default optimisations and support user override
+# we use CFLAGS to set default optimisations which users may override
 CFLAGS ?= -pipe -march=native -mtune=native -flto=auto
 # user can override this with make -j
-MAKEFLAGS = -j$(shell nproc)
+MAKEFLAGS := -j$(shell nproc)
 # DP makefile overrides CFLAGS (exporting CFLAGS does work for d0_blind_id but so does this)
 export CC += $(CFLAGS)
 
@@ -28,67 +28,80 @@ export DP_LINK_CRYPTO_RIJNDAEL=shared
 .PHONY: help
 help:
        @echo
-       @echo "  ===== Xonotic Makefile for stable and beta releases ====="
+       @printf "     \e[1;33m===== Xonotic Makefile for stable and beta releases =====\e[m\n"
        @echo
-       @echo "The DarkPlaces engine builds will be named $(CLIENT) and $(SERVER) and"
-       @echo "will be preferred by the xonotic-linux-sdl.sh and xonotic-linux-dedicated.sh scripts."
+       @printf "The DarkPlaces Engine builds will be named \e[1m$(CLIENT) \e[mand \e[1m$(SERVER)\e[m\n"
+       @printf "and will be preferred by \e[1mxonotic-linux-sdl.sh \e[mand \e[1mxonotic-linux-dedicated.sh \e[mscripts.\n"
        @echo
-       @echo "For more info, see https://gitlab.com/xonotic/xonotic/-/wikis/Compiling"
+       @printf "More info is available at \e[1;36mhttps://gitlab.com/xonotic/xonotic/-/wikis/Compiling\e[m\n"
        @echo
-       @echo "-O3 is already enabled for DarkPlaces. Do not add any math flags!"
+       @echo   "-O3 is already enabled for DarkPlaces Engine. Do not add any math flags!"
        @echo
-       @echo "MAKEFLAGS=$(MAKEFLAGS)"
-       @echo "CFLAGS= $(CFLAGS)"
+       @echo   "MAKEFLAGS=$(MAKEFLAGS)"
+       @echo   "CFLAGS= $(CFLAGS)"
        @echo
-       @echo "  make clean-sources         Delete build objects"
-       @echo "  make clean                 Delete engine builds and build objects"
+       @echo   "  make clean-sources         Delete build objects"
+       @echo   "  make clean                 Delete engine builds and build objects"
        @echo
-       @echo "  make update-stable         Update to the latest stable release via rsync"
-       @echo "  make update-beta           Update to the latest daily autobuild via rsync"
+       @echo   "  make update-stable         Update to the latest stable release via rsync"
+       @echo   "  make update-beta           Update to the latest beta autobuild via rsync"
        @echo
-       @echo "  make server                Compile $(SERVER)"
-       @echo "  make client                Compile $(CLIENT)"
-       @echo "  make both"
+       @printf "  make server                Compile \e[1m$(SERVER)\e[m\n"
+       @printf "  make client                Compile \e[1m$(CLIENT)\e[m\n"
+       @echo   "  make both"
        @echo
 
-.PHONY: nogit
-nogit:
-       @if [ -d .git ]; then \
-               echo "To compile from git sources, please use ./all instead!"; \
-               exit 1; \
-       fi
+GIT := $(shell [ -d .git ] && printf "\e[1;31mThis Makefile only supports stable releases and autobuilds, whereas you are using a git repository.  To compile from git, please read https://gitlab.com/xonotic/xonotic/-/wikis/Repository_Access\e[m")
+ifdef GIT
+  $(error $(GIT))
+endif
+
+
+# If requested, these targets must always run first:
+.EXTRA_PREREQS := $(filter clean update-stable update-beta, $(MAKECMDGOALS))
+# It makes sense to `clean-sources` after building if requested.
+.NOTPARALLEL: $(.EXTRA_PREREQS) clean-sources
 
 .PHONY: clean-sources
-clean-sources: nogit
+clean-sources:
        $(MAKE) -C $(DPSRC) clean
-       $(MAKE) -C $(D0SRC) clean
+       ( $(MAKE) -C $(D0SRC) clean || true ) # autotools may not have created the Makefile yet
+clean-sources: .EXTRA_PREREQS =  # prevents circular dependency
 
 .PHONY: clean
 clean: clean-sources
        $(RM) $(CLIENT) $(SERVER)
 
 .PHONY: update-stable
-update-stable: nogit
+update-stable:
        misc/tools/rsync-updater/update-to-release.sh
 
 .PHONY: update-beta
-update-beta: nogit
+update-beta:
        misc/tools/rsync-updater/update-to-autobuild.sh
 
-.PHONY: crypto
-crypto: nogit
+
+$(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a:
        ( cd $(D0SRC) && ./autogen.sh && ./configure --enable-static --disable-shared )
+       $(MAKE) -C $(D0SRC) clean  # ensures missing .a files are created FIXME WORKAROUND
        $(MAKE) -C $(D0SRC)
 
-.PHONY: server
-server: crypto
+$(DPSRC)/darkplaces-dedicated: $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a
        $(MAKE) -C $(DPSRC) sv-release
-       cp -v $(DPSRC)/darkplaces-dedicated $(SERVER)
+$(SERVER): $(DPSRC)/darkplaces-dedicated
+       cp $(DPSRC)/darkplaces-dedicated $(SERVER)
 
-.PHONY: client
-client: crypto
+$(DPSRC)/darkplaces-sdl: $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a
        $(MAKE) -C $(DPSRC) sdl-release
-       cp -v $(DPSRC)/darkplaces-sdl $(CLIENT)
+$(CLIENT): $(DPSRC)/darkplaces-sdl
+       cp $(DPSRC)/darkplaces-sdl $(CLIENT)
+
+
+.PHONY: server
+server: $(SERVER)
+
+.PHONY: client
+client: $(CLIENT)
 
 .PHONY: both
 both: client server