From: bones_was_here <bones_was_here@xonotic.au>
Date: Sun, 24 Dec 2023 12:07:04 +0000 (+1000)
Subject: Makefile: remove kludge from libd0 linking
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=27e8098c364bf3d17eb833c58f6a18db53be6ad4;p=xonotic%2Fxonotic.git

Makefile: remove kludge from libd0 linking
---

diff --git a/Makefile b/Makefile
index 1ab3dc2b..4a2c90e7 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