From: Lyberta Date: Sat, 16 Jun 2018 13:44:16 +0000 (+0300) Subject: Merge branch 'master' into Lyberta/d0BuildFix X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2Fd0BuildFix;p=xonotic%2Fxonotic.git Merge branch 'master' into Lyberta/d0BuildFix --- d9da7e24b4db9cb6079d63df57d84ae483ca7eb1 diff --cc misc/tools/all/xonotic.subr index 0076dae4,1c24f3bf..e83aa0a4 --- a/misc/tools/all/xonotic.subr +++ b/misc/tools/all/xonotic.subr @@@ -191,8 -198,27 +198,9 @@@ case "$cmd" i verbose cp "$d0/misc/buildfiles/win32/libd0_blind_id"-* .libs/ verbose cp "$d0/misc/buildfiles/win32/libd0_rijndael"-* .libs/ verbose cp "$d0/misc/buildfiles/win32/libgmp"-* .libs/ + compiled0=false else case "`uname`" in - Linux) - case `uname -m` in - *86) - # 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=false - ;; - *) - msg "Always need to compile libd0_blind_id on Linux `uname -m`." - ;; - esac - ;; Darwin) verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_blind_id".* .libs/ verbose cp "$d0/misc/buildfiles/osx/Xonotic.app/Contents/MacOS/libd0_rijndael".* .libs/