X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=Makefile;h=50d829efd50bd2dd0e0a78c4936fc197771c5b8f;hb=HEAD;hp=1ab3dc2b10f2904dd6810c1f042321e7266ac71a;hpb=584edbe3c5a1f0ab189d84d4d7b4a921f8064160;p=xonotic%2Fxonotic.git

diff --git a/Makefile b/Makefile
index 1ab3dc2b..d7d329d2 100644
--- a/Makefile
+++ b/Makefile
@@ -15,14 +15,10 @@ export CC += $(CFLAGS)
 export CC += -I$(PWD)/source/
 # d0_blind_id static libs location
 export CC += -L$(PWD)/$(D0SRC)/.libs/
-# Player IDs: DP_LINK_CRYPTO needs to be set (else it defaults to "dlopen"),
-# it should be set to "shared" but then LIB_CRYPTO gets overridden in DP makefile,
-# and we need to set LIB_CRYPTO such that libgmp gets linked
-export DP_LINK_CRYPTO=foo
-export CFLAGS_CRYPTO=-DLINK_TO_CRYPTO
-export LIB_CRYPTO=-ld0_blind_id -lgmp
+# Player IDs
+export DP_LINK_CRYPTO=static
 # AES
-export DP_LINK_CRYPTO_RIJNDAEL=shared
+export DP_LINK_CRYPTO_RIJNDAEL=static
 
 
 .PHONY: help
@@ -59,8 +55,6 @@ 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:
@@ -86,12 +80,12 @@ $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a:
 	$(MAKE) -C $(D0SRC) clean  # ensures missing .a files are created FIXME WORKAROUND
 	$(MAKE) -C $(D0SRC)
 
-$(DPSRC)/darkplaces-dedicated: $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a
+$(DPSRC)/darkplaces-dedicated: $(D0SRC)/.libs/libd0_blind_id.a
 	$(MAKE) -C $(DPSRC) sv-release
 $(SERVER): $(DPSRC)/darkplaces-dedicated
 	cp $(DPSRC)/darkplaces-dedicated $(SERVER)
 
-$(DPSRC)/darkplaces-sdl: $(D0SRC)/.libs/libd0_blind_id.a $(D0SRC)/.libs/libd0_rijndael.a
+$(DPSRC)/darkplaces-sdl: $(D0SRC)/.libs/libd0_blind_id.a
 	$(MAKE) -C $(DPSRC) sdl-release
 $(CLIENT): $(DPSRC)/darkplaces-sdl
 	cp $(DPSRC)/darkplaces-sdl $(CLIENT)