From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 12 Sep 2013 16:32:09 +0000 (+0200)
Subject: Support the deps subdirs.
X-Git-Tag: xonotic-v0.8.0~77
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=174f28272e570c87ba0c179a716442e035b43c06;p=xonotic%2Fxonotic.git

Support the deps subdirs.
---

diff --git a/misc/tools/all/release.subr b/misc/tools/all/release.subr
index eb402c2a..c96f573a 100644
--- a/misc/tools/all/release.subr
+++ b/misc/tools/all/release.subr
@@ -222,7 +222,7 @@ case "$cmd" in
 			case " $HOSTS_THAT_ARE_MYSELF " in
 				*\ $host\ *)
 					verbose rsync --delete -zLvaSHP "$srcdir"/ "$buildpath/"
-					verbose rsync --delete -zLvaSHP "$depsdir"/ "$buildpath.deps/"
+					verbose rsync --delete -zLvaSHP "$depsdir"/*/ "$buildpath.deps/"
 					verbose ln -snf "$buildpath.deps" "$buildpath/.deps"
 					verbose eval make -C "$buildpath" clean $maketargets $makeflags
 					for f in $targetfiles; do
@@ -231,7 +231,7 @@ case "$cmd" in
 					;;
 				*)
 					verbose rsync --delete -zLvaSHP "$srcdir"/ "$host:$buildpath/"
-					verbose rsync --delete -zLvaSHP "$depsdir"/ "$host:$buildpath.deps/"
+					verbose rsync --delete -zLvaSHP "$depsdir"/*/ "$host:$buildpath.deps/"
 					verbose ssh "$host" "[ -f /etc/profile ] && . /etc/profile; [ -f ~/.profile ] && . ~/.profile; export LC_ALL=C; ln -snf $buildpath.deps $buildpath/.deps && cd $buildpath && nice -`nice` make clean $maketargets $makeflags"
 					for f in $targetfiles; do
 						verbose rsync -zvaSHP "$host:$buildpath/${f%:*}" "${f##*:}" || true
diff --git a/misc/tools/all/xonotic.subr b/misc/tools/all/xonotic.subr
index 63f7efbd..88efde25 100644
--- a/misc/tools/all/xonotic.subr
+++ b/misc/tools/all/xonotic.subr
@@ -194,26 +194,24 @@ case "$cmd" in
 					Linux)
 						case `uname -m` in
 							x86_64)
-								#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.linux64/include"
-								export CC="$CC -L../../../../misc/builddeps/dp.linux64/lib"
-								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/dp.linux64/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"
+								# No cp commands, we want to use static linking instead.
+								export CC="$CC -I../../../../misc/builddeps/linux64/d0_blind_id/include"
+								export CC="$CC -L../../../../misc/builddeps/linux64/d0_blind_id/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/d0_blind_id/lib"
+								export CC="$CC -I../../../../misc/builddeps/linux64/gmp/include"
+								export CC="$CC -L../../../../misc/builddeps/linux64/gmp/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux64/gmp/lib"
+								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux64/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux64/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux64/d0_blind_id/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"
+								# No cp commands, we want to use static linking instead.
+								export CC="$CC -I../../../../misc/builddeps/linux32/d0_blind_id/include"
+								export CC="$CC -L../../../../misc/builddeps/linux32/d0_blind_id/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/d0_blind_id/lib"
+								export CC="$CC -I../../../../misc/builddeps/linux32/gmp/include"
+								export CC="$CC -L../../../../misc/builddeps/linux32/gmp/lib"
+								export CC="$CC -Wl,-rpath,../../../../misc/builddeps/linux32/gmp/lib"
+								MAKEFLAGS="$MAKEFLAGS DP_LINK_CRYPTO=shared DP_LINK_CRYPTO_RIJNDAEL=shared LIB_CRYPTO=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_blind_id.a LIB_CRYPTO+=../../../../misc/builddeps/linux32/gmp/lib/libgmp.a LIB_CRYPTO_RIJNDAEL=../../../../misc/builddeps/linux32/d0_blind_id/lib/libd0_rijndael.a"
 								;;
 							*)
 								compiled0=true