From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 8 Sep 2013 17:19:04 +0000 (+0200)
Subject: add lazy hack to fix jpeg problem. Needs to be turned into real fix
X-Git-Tag: xonotic-v0.8.0~81
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=348fb4a9f304d0f556bd6de9e6600d56e491d2b1;p=xonotic%2Fxonotic.git

add lazy hack to fix jpeg problem. Needs to be turned into real fix
later.
---

diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 7214f453..0e0fd5f0 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -197,14 +197,22 @@ case "$cmd" in
 								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_blind_id".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libd0_rijndael".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux64/lib/libgmp".* .libs/
+								# FIXME(whoeverwantsto) get rid of this -I flag, as we just can't do this (the directory has other stuff, e.g. jpeg, inside).
+								# FIXME(whoeverwantsto) maybe use the cp commands from above again, and load via dlopen again? Needs evaluation of whether they work.
 								export CC="$CC -I../../../../misc/builddeps/dp.linux32/include"
+								export CC="$CC -L../../../../misc/builddeps/dp.linux32/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/dp.linux32/lib"
 								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/dp.linux64/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/dp.linux64/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/dp.linux64/lib/libd0_rijndael.a"
 								;;
 							*86)
 								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_blind_id".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libd0_rijndael".* .libs/
 								#verbose cp "$d0/misc/builddeps/dp.linux32/lib/libgmp".* .libs/
+								# FIXME(whoeverwantsto) get rid of this -I flag, as we just can't do this (the directory has other stuff, e.g. jpeg, inside).
+								# FIXME(whoeverwantsto) maybe use the cp commands from above again, and load via dlopen again? Needs evaluation of whether they work.
 								export CC="$CC -I../../../../misc/builddeps/dp.linux32/include"
+								export CC="$CC -L../../../../misc/builddeps/dp.linux32/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/dp.linux32/lib"
 								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/dp.linux32/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/dp.linux32/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/dp.linux32/lib/libd0_rijndael.a"
 								;;
 							*)