diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
index 119ed7ff..6087b7cd 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h
index 0ae92f2d..cd854e89 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_active.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h
index 3a8e7fa8..e879c989 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_audio.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h
index 9b93cd69..47332c3d 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_byteorder.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h
index fff5cfa1..febb19dc 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cdrom.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
index a5081016..09ba38a7 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h
index 07c2f081..fb03098e 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_dreamcast.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h
index 4ba5c22c..4fe1715a 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macos.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
index 295b8724..84be6177 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_macosx.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h
index bb40df00..42edd20e 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_os2.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
index 6d019a8d..da2c15dd 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_config_win32.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h
index 1bd6b84c..b5b64f29 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_copying.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h
index f4be8e03..4200d6d1 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_cpuinfo.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
index f7a2e2f8..fd9fc867 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_endian.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -39,6 +39,10 @@
 /*@}*/
 
 #ifndef SDL_BYTEORDER	/* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER  __BYTE_ORDER
+#else /* __linux __ */
 #if defined(__hppa__) || \
     defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     (defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -48,6 +52,7 @@
 #else
 #define SDL_BYTEORDER	SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 
 
@@ -86,7 +91,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
 	__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
 	return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
 static __inline__ Uint16 SDL_Swap16(Uint16 x)
 {
 	__asm__("rorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
@@ -94,7 +99,7 @@ static __inline__ Uint16 SDL_Swap16(Uint16 x)
 }
 #else
 static __inline__ Uint16 SDL_Swap16(Uint16 x) {
-	return((x<<8)|(x>>8));
+	return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
 }
 #endif
 
@@ -121,7 +126,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
 	__asm__("rlwimi %0,%2,24,0,7"   : "=&r" (result) : "0" (result),    "r" (x));
 	return result;
 }
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
 static __inline__ Uint32 SDL_Swap32(Uint32 x)
 {
 	__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) :  "0" (x) : "cc");
@@ -129,7 +134,7 @@ static __inline__ Uint32 SDL_Swap32(Uint32 x)
 }
 #else
 static __inline__ Uint32 SDL_Swap32(Uint32 x) {
-	return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
+	return SDL_static_cast(Uint32, ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24)));
 }
 #endif
 
@@ -166,7 +171,7 @@ static __inline__ Uint64 SDL_Swap64(Uint64 x)
 	x = SDL_Swap32(lo);
 	x <<= 32;
 	x |= SDL_Swap32(hi);
-	return(x);
+	return (x);
 }
 #endif
 #else
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h
index b103703a..4e1cce3b 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_error.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h
index c94a30c9..94b42025 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_events.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h
index 253ad88c..bea63007 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_getenv.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h
index d5135c3d..708d1a9f 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_joystick.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h
index 7b59d24e..9d7129c5 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keyboard.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h
index 90101286..f2ad12b8 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_keysym.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h
index 45a17f9f..0c5e5362 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_loadso.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h
index b7f6b2c8..ab50ef1e 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_main.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
index a573f04e..7c563b94 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mouse.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h
index 920971df..c8da9b1a 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_mutex.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h
index c479a3a4..3d791d69 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_opengl.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -3108,21 +3108,35 @@ typedef char GLchar;			/* native character */
 
 #ifndef GL_VERSION_1_5
 /* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptr;
+typedef long GLsizeiptr;
+#else
 typedef ptrdiff_t GLintptr;
 typedef ptrdiff_t GLsizeiptr;
 #endif
+#endif
 
 #ifndef GL_ARB_vertex_buffer_object
 /* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptrARB;
+typedef long GLsizeiptrARB;
+#else
 typedef ptrdiff_t GLintptrARB;
 typedef ptrdiff_t GLsizeiptrARB;
 #endif
+#endif
 
 #ifndef GL_ARB_shader_objects
 /* GL types for handling shader object handles and program/shader text */
 typedef char GLcharARB;		/* native character */
+#if defined(__APPLE__)
+typedef void *GLhandleARB;	/* shader object handle */
+#else
 typedef unsigned int GLhandleARB;	/* shader object handle */
 #endif
+#endif
 
 /* GL types for "half" precision (s10e5) float data in host memory */
 #ifndef GL_ARB_half_float_pixel
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
index 11d86736..48540a85 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_platform.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h
index 6d82e7e0..abd2ec6c 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_quit.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
index a450119f..98361d7e 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_rwops.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
index e1f85fb7..35a4fdde 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_stdinc.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
index 716dddcb..78433c6a 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_syswm.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -203,12 +203,13 @@ typedef struct SDL_SysWMinfo {
 /**
  * This function gives you custom hooks into the window manager information.
  * It fills the structure pointed to by 'info' with custom information and
- * returns 1 if the function is implemented.  If it's not implemented, or
- * the version member of the 'info' structure is invalid, it returns 0. 
+ * returns 0 if the function is not implemented, 1 if the function is 
+ * implemented and no error occurred, and -1 if the version member of
+ * the 'info' structure is not filled in or not supported.
  *
  * You typically use this function like this:
  * @code
- * SDL_SysWMInfo info;
+ * SDL_SysWMinfo info;
  * SDL_VERSION(&info.version);
  * if ( SDL_GetWMInfo(&info) ) { ... }
  * @endcode
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
index 1ca9a1bc..9ebe00ed 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_thread.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -68,11 +68,6 @@ typedef struct SDL_Thread SDL_Thread;
 #ifdef __OS2__
 typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg); 
 typedef void (*pfnSDL_CurrentEndThread)(void);
-#elif __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
-        unsigned (__stdcall *func)(void *), void *arg, 
-        unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
 #else
 typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
         unsigned (__stdcall *func)(void *), void *arg, 
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h
index d7cd0246..d764d5f3 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_timer.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h
index cfa35236..79d8b28d 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_types.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
index fa02c3f6..fdc17c64 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_version.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ extern "C" {
 /*@{*/
 #define SDL_MAJOR_VERSION	1
 #define SDL_MINOR_VERSION	2
-#define SDL_PATCHLEVEL		14
+#define SDL_PATCHLEVEL		15
 /*@}*/
 
 typedef struct SDL_version {
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
index 8f7f3052..f9c4e070 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/SDL_video.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
index 22748090..27e2f7bc 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/begin_code.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -43,7 +43,7 @@
 #ifndef DECLSPEC
 # if defined(__BEOS__) || defined(__HAIKU__)
 #  if defined(__GNUC__)
-#   define DECLSPEC	__declspec(dllexport)
+#   define DECLSPEC
 #  else
 #   define DECLSPEC	__declspec(export)
 #  endif
@@ -132,7 +132,12 @@
 #ifdef __BORLANDC__
 #pragma nopackwarning
 #endif
+#ifdef _M_X64
+/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
+#pragma pack(push,8)
+#else
 #pragma pack(push,4)
+#endif
 #elif (defined(__MWERKS__) && defined(__MACOS__))
 #pragma options align=mac68k4byte
 #pragma enumsalwaysint on
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/close_code.h b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/close_code.h
index 46a07208..19a00246 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/close_code.h
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Headers/close_code.h
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist b/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
index 2a169012..5158033d 100644
--- a/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
+++ b/source/xcode/Frameworks/SDL.framework/Versions/A/Resources/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>BuildMachineOSBuild</key>
+	<string>11C74</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -22,5 +24,19 @@
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
 	<string>1.2.14</string>
+	<key>DTCompiler</key>
+	<string></string>
+	<key>DTPlatformBuild</key>
+	<string>4D502</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>11C63</string>
+	<key>DTSDKName</key>
+	<string>macosx10.7</string>
+	<key>DTXcode</key>
+	<string>0421</string>
+	<key>DTXcodeBuild</key>
+	<string>4D502</string>
 </dict>
 </plist>
diff --git a/source/xcode/Frameworks/SDL.framework/Versions/A/SDL b/source/xcode/Frameworks/SDL.framework/Versions/A/SDL
index 2ccf7d95..89db482e 100755
Binary files a/source/xcode/Frameworks/SDL.framework/Versions/A/SDL and b/source/xcode/Frameworks/SDL.framework/Versions/A/SDL differ
diff --git a/source/xcode/assaultcube.plist b/source/xcode/assaultcube.plist
index 4ee8a49b..85f52b5e 100644
--- a/source/xcode/assaultcube.plist
+++ b/source/xcode/assaultcube.plist
@@ -2,21 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSMinimumSystemVersionByArchitecture</key>
-	<dict>
-		<key>x86_64</key>
-		<string>10.6.0</string>
-		<key>i386</key>
-		<string>10.4.0</string>
-		<key>ppc</key>
-		<string>10.4.0</string>
-	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>assaultcube</string>
 	<key>CFBundleIconFile</key>
 	<string>assaultcube</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.cubers</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -25,6 +18,15 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1.2.x.x</string>
+	<key>LSMinimumSystemVersionByArchitecture</key>
+	<dict>
+		<key>i386</key>
+		<string>10.4.0</string>
+		<key>ppc</key>
+		<string>10.4.0</string>
+		<key>x86_64</key>
+		<string>10.6.0</string>
+	</dict>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/source/xcode/assaultcube.xcodeproj/project.pbxproj b/source/xcode/assaultcube.xcodeproj/project.pbxproj
index ed30a3b9..a26e171b 100644
--- a/source/xcode/assaultcube.xcodeproj/project.pbxproj
+++ b/source/xcode/assaultcube.xcodeproj/project.pbxproj
@@ -7,8 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4FD7C9D3171F34D400D81258 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FD7C9D2171F34D300D81258 /* libcurl.framework */; };
-		4FD7C9D5171F355200D81258 /* libcurl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4FD7C9D4171F355200D81258 /* libcurl.framework */; };
+		4FEAF3331A14757700B42D47 /* libcurl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FEAF3321A14757700B42D47 /* libcurl.framework */; };
+		4FEAF3341A1475E600B42D47 /* libcurl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4FEAF3321A14757700B42D47 /* libcurl.framework */; };
+		4FEAF3381A147F9F00B42D47 /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EB8171511ED9AEF00799589 /* SDL.framework */; };
+		4FEAF3391A147FAE00B42D47 /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171511ED9AEF00799589 /* SDL.framework */; };
 		665CDCA60AFE7ECD0030D605 /* callbacks.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC6B0AFE7ECC0030D605 /* callbacks.c */; };
 		665CDCB80AFE7ECD0030D605 /* host.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC7E0AFE7ECD0030D605 /* host.c */; };
 		665CDCCB0AFE7ECD0030D605 /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 665CDC930AFE7ECD0030D605 /* list.c */; };
@@ -33,7 +35,6 @@
 		9EB8172111ED9AEF00799589 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EB8171911ED9AEF00799589 /* Vorbis.framework */; };
 		9EB8179311ED9EDF00799589 /* INTL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171211ED9AEF00799589 /* INTL.framework */; };
 		9EB8179511ED9EDF00799589 /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171411ED9AEF00799589 /* Ogg.framework */; };
-		9EB8179611ED9EDF00799589 /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171511ED9AEF00799589 /* SDL.framework */; };
 		9EB8179711ED9EDF00799589 /* SDL_image.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171611ED9AEF00799589 /* SDL_image.framework */; };
 		9EB8179A11ED9EDF00799589 /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171911ED9AEF00799589 /* Vorbis.framework */; };
 		9EB8181D11EDA56D00799589 /* assaultcube.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9EB817DE11EDA3A300799589 /* assaultcube.icns */; };
@@ -98,7 +99,6 @@
 		B9EF952411CEE3D300B773C1 /* i18n.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE5111CAC42F009BA307 /* i18n.cpp */; };
 		B9FA3B7D0DD9E6E400581F8D /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9FA3B7C0DD9E6E400581F8D /* OpenAL.framework */; };
 		D23715801690FCA500AB6EDD /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D237157E1690FCA500AB6EDD /* SDL_image.framework */; };
-		D23715811690FCA500AB6EDD /* SDL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D237157F1690FCA500AB6EDD /* SDL.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -118,10 +118,10 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				4FD7C9D5171F355200D81258 /* libcurl.framework in CopyFiles */,
+				4FEAF3391A147FAE00B42D47 /* SDL.framework in CopyFiles */,
+				4FEAF3341A1475E600B42D47 /* libcurl.framework in CopyFiles */,
 				9EB8179311ED9EDF00799589 /* INTL.framework in CopyFiles */,
 				9EB8179511ED9EDF00799589 /* Ogg.framework in CopyFiles */,
-				9EB8179611ED9EDF00799589 /* SDL.framework in CopyFiles */,
 				9EB8179711ED9EDF00799589 /* SDL_image.framework in CopyFiles */,
 				9EB8179A11ED9EDF00799589 /* Vorbis.framework in CopyFiles */,
 			);
@@ -134,8 +134,7 @@
 		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
-		4FD7C9D2171F34D300D81258 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = Frameworks/libcurl.framework; sourceTree = "<group>"; };
-		4FD7C9D4171F355200D81258 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = Frameworks/libcurl.framework; sourceTree = "<group>"; };
+		4FEAF3321A14757700B42D47 /* libcurl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libcurl.framework; path = Frameworks/libcurl.framework; sourceTree = "<group>"; };
 		665CDC6B0AFE7ECC0030D605 /* callbacks.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = callbacks.c; sourceTree = "<group>"; };
 		665CDC7E0AFE7ECD0030D605 /* host.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = host.c; sourceTree = "<group>"; };
 		665CDC930AFE7ECD0030D605 /* list.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
@@ -259,7 +258,6 @@
 		B975E7F30EBCC3A200880D5D /* map.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = map.icns; sourceTree = "<group>"; };
 		B9FA3B7C0DD9E6E400581F8D /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = /System/Library/Frameworks/OpenAL.framework; sourceTree = "<absolute>"; };
 		D237157E1690FCA500AB6EDD /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = ../../../../../../../../../../Library/Frameworks/SDL_image.framework; sourceTree = "<group>"; };
-		D237157F1690FCA500AB6EDD /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = ../../../../../../../../../../Library/Frameworks/SDL.framework; sourceTree = "<group>"; };
 		F5A47A9D01A0482F01D3D55B /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = SOURCE_ROOT; };
 		F5A47A9E01A0483001D3D55B /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SDLMain.m; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -269,9 +267,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4FD7C9D3171F34D400D81258 /* libcurl.framework in Frameworks */,
+				4FEAF3381A147F9F00B42D47 /* SDL.framework in Frameworks */,
+				4FEAF3331A14757700B42D47 /* libcurl.framework in Frameworks */,
 				D23715801690FCA500AB6EDD /* SDL_image.framework in Frameworks */,
-				D23715811690FCA500AB6EDD /* SDL.framework in Frameworks */,
 				B94198C309207E810029DAD1 /* Cocoa.framework in Frameworks */,
 				B9FA3B7D0DD9E6E400581F8D /* OpenAL.framework in Frameworks */,
 				B94198C409207E810029DAD1 /* OpenGL.framework in Frameworks */,
@@ -342,10 +340,7 @@
 		29B97314FDCFA39411CA2CEA /* sauerbraten */ = {
 			isa = PBXGroup;
 			children = (
-				4FD7C9D4171F355200D81258 /* libcurl.framework */,
-				4FD7C9D2171F34D300D81258 /* libcurl.framework */,
 				D237157E1690FCA500AB6EDD /* SDL_image.framework */,
-				D237157F1690FCA500AB6EDD /* SDL.framework */,
 				080E96DDFE201D6D7F000001 /* Classes */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
@@ -385,6 +380,7 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				4FEAF3321A14757700B42D47 /* libcurl.framework */,
 				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
 				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
 			);
@@ -752,6 +748,8 @@
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 					"\"$(SRCROOT)/Frameworks\"",
+					"$(PROJECT_DIR)/Frameworks",
+					"$(LOCAL_LIBRARY_DIR)/Frameworks",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Frameworks\"";
@@ -768,14 +766,16 @@
 					../include/,
 				);
 				INFOPLIST_FILE = assaultcube.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../lib\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
 				OTHER_LDFLAGS = "-lz";
 				PRODUCT_NAME = assaultcube;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 				STRIP_STYLE = all;
 			};
 			name = Debug;
@@ -788,6 +788,8 @@
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 					"\"$(SRCROOT)/Frameworks\"",
+					"$(PROJECT_DIR)/Frameworks",
+					"$(LOCAL_LIBRARY_DIR)/Frameworks",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Frameworks\"";
@@ -804,14 +806,16 @@
 					../include/,
 				);
 				INFOPLIST_FILE = assaultcube.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../lib\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
 				OTHER_LDFLAGS = "-lz";
 				PRODUCT_NAME = assaultcube;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 				STRIP_STYLE = all;
 			};
 			name = Release;
@@ -826,6 +830,8 @@
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
 					"\"$(SRCROOT)/Frameworks\"",
+					"$(PROJECT_DIR)/Frameworks",
+					"$(LOCAL_LIBRARY_DIR)/Frameworks",
 				);
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/Frameworks\"";
 				FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/Frameworks\"";
@@ -846,15 +852,17 @@
 					../include/,
 				);
 				INFOPLIST_FILE = assaultcube.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"$(SRCROOT)/../lib\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET_i386 = 10.5;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = "-lz";
 				PRODUCT_NAME = assaultcube;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 				STRIP_STYLE = all;
 			};
 			name = "Release-Deployment";
@@ -867,11 +875,10 @@
 				DEPLOYMENT_POSTPROCESSING = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				MACOSX_DEPLOYMENT_TARGET = "";
+				GCC_VERSION = "";
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = "Release-Deployment";
@@ -883,12 +890,11 @@
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				MACOSX_DEPLOYMENT_TARGET = "";
+				GCC_VERSION = "";
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Debug;
@@ -900,11 +906,10 @@
 				COPY_PHASE_STRIP = NO;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_OPTIMIZATION_LEVEL = 3;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				MACOSX_DEPLOYMENT_TARGET = "";
+				GCC_VERSION = "";
 				MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
 				MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
-				SDKROOT = macosx;
+				SDKROOT = macosx10.8;
 				STRIP_INSTALLED_PRODUCT = NO;
 			};
 			name = Release;