From 5861689e7d5cf537ff4ec717a0f3033207be3eec Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 1 Jun 2011 06:47:39 +0200
Subject: [PATCH 1/2] we need SDL.dll in the main dir, still

---
 all | 1 +
 1 file changed, 1 insertion(+)

diff --git a/all b/all
index 8b3806e..92e6340 100755
--- a/all
+++ b/all
@@ -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

From f346657d6504f9290e97f50353f3d754667d6a69 Mon Sep 17 00:00:00 2001
From: root <root@NewDawn.(none)>
Date: Fri, 3 Jun 2011 16:04:40 -0500
Subject: [PATCH 2/2] Changed lines 4 and 5 of server_linux.sh to the correct
 file names. executable="xonotic-linux64-dedicated" ;;
 executable="xonotic-linux32-dedicated" ;; This resolves ticket #478

---
 server/server_linux.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/server_linux.sh b/server/server_linux.sh
index feda43b..d45ae16 100755
--- a/server/server_linux.sh
+++ b/server/server_linux.sh
@@ -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}"`"