Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic

This commit is contained in:
Rudolf Polzer 2011-06-04 22:31:16 +02:00
commit 2c86c96dcf
2 changed files with 3 additions and 2 deletions

1
all
View File

@ -1612,6 +1612,7 @@ case "$cmd" in
verbose mkdir data fteqcc source source/darkplaces source/fteqcc source/d0_blind_id mapping
verbose rm -rf misc/builddeps
verbose mv misc/buildfiles/win32 bin32 || true
verbose mv bin32/SDL.dll . || true
verbose mv misc/buildfiles/win64 bin64 || true
verbose mv misc/buildfiles/osx/* . || true
verbose rm -rf misc/buildfiles

View File

@ -1,8 +1,8 @@
#!/bin/sh
case "$(uname -m)" in
x86_64) executable="xonotic-linux-x86_64-dedicated" ;;
*) executable="xonotic-linux-686-dedicated" ;;
x86_64) executable="xonotic-linux64-dedicated" ;;
*) executable="xonotic-linux32-dedicated" ;;
esac
cd "`dirname "${0}"`"