Merge branch 'master' into Lyberta/d0BuildFix

diff --cc misc/tools/all/xonotic.subr
index 0076dae4763a9a3c3402bc8746492149eb277584,1c24f3bfb190121e0f65a8c1b966fb3bfb984cbb..e83aa0a4050d74c7394f1ae14a71bd951ded2882
--- 1/misc/tools/all/xonotic.subr
--- 2/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/