From: bones_was_here Date: Sun, 24 Dec 2023 12:04:02 +0000 (+1000) Subject: Makefile: support explicit static linking of libd0 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df973c344562c8cadc2413d36dcaa03f8e9040c2;p=xonotic%2Fdarkplaces.git Makefile: support explicit static linking of libd0 Allows a kludge to be removed in Xonotic. Signed-off-by: bones_was_here --- diff --git a/makefile b/makefile index 1ca0fe1a..eb978a86 100644 --- a/makefile +++ b/makefile @@ -295,19 +295,23 @@ ifeq ($(DP_LINK_ODE), dlopen) endif # d0_blind_id -ifeq ($(DP_LINK_CRYPTO), shared) +ifeq ($(DP_LINK_CRYPTO), static) + LIB_CRYPTO=-ld0_blind_id -lgmp + CFLAGS_CRYPTO=-DLINK_TO_CRYPTO +else ifeq ($(DP_LINK_CRYPTO), shared) LIB_CRYPTO=-ld0_blind_id CFLAGS_CRYPTO=-DLINK_TO_CRYPTO -endif -ifeq ($(DP_LINK_CRYPTO), dlopen) +else ifeq ($(DP_LINK_CRYPTO), dlopen) LIB_CRYPTO= CFLAGS_CRYPTO= endif +ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), static) + DP_LINK_CRYPTO_RIJNDAEL=shared +endif ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared) LIB_CRYPTO_RIJNDAEL=-ld0_rijndael CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL -endif -ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen) +else ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen) LIB_CRYPTO_RIJNDAEL= CFLAGS_CRYPTO_RIJNDAEL= endif