From 348fb4a9f304d0f556bd6de9e6600d56e491d2b1 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 8 Sep 2013 19:19:04 +0200 Subject: [PATCH] add lazy hack to fix jpeg problem. Needs to be turned into real fix later. --- misc/tools/all/xonotic.subr | 8 ++++++++ 1 file changed, 8 insertions(+) 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" ;; *) -- 2.39.2