]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Makefile: remove kludge from libd0 linking
authorbones_was_here <bones_was_here@xonotic.au>
Sun, 24 Dec 2023 12:07:04 +0000 (22:07 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Mon, 25 Dec 2023 11:33:44 +0000 (21:33 +1000)
Makefile

index 1ab3dc2b10f2904dd6810c1f042321e7266ac71a..4a2c90e76acd4f80823122840bd931a5e0e1c5c1 100644 (file)
--- 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