From 8edfa800280d49c51c56e044d75b0858c20ed0a2 Mon Sep 17 00:00:00 2001
From: Joel de Vahl <joel@stalverk80.se>
Date: Tue, 21 Oct 2008 15:59:32 +0000
Subject: Use SDL on OSX

---
 src/engine/client/ec_client.c | 4 ++++
 src/engine/client/ec_gfx.c    | 9 +++++++++
 2 files changed, 13 insertions(+)

(limited to 'src/engine/client')

diff --git a/src/engine/client/ec_client.c b/src/engine/client/ec_client.c
index 96700cb0..8ef6cf51 100644
--- a/src/engine/client/ec_client.c
+++ b/src/engine/client/ec_client.c
@@ -1841,7 +1841,11 @@ const char *client_user_directory()
 	return path;
 }
 
+#if defined(CONF_PLATFORM_MACOSX)
+int SDL_main(int argc, char **argv)
+#else
 int main(int argc, char **argv)
+#endif
 {
 	/* init the engine */
 	dbg_msg("client", "starting...");
diff --git a/src/engine/client/ec_gfx.c b/src/engine/client/ec_gfx.c
index c4e892cc..bb5c7e91 100644
--- a/src/engine/client/ec_gfx.c
+++ b/src/engine/client/ec_gfx.c
@@ -1,13 +1,22 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 
+#include <base/detect.h>
+
 #ifdef CONFIG_NO_SDL
 	#include <GL/glfw.h>
 #else
 	#include "SDL.h"
+
+#ifdef CONF_PLATFORM_MACOSX
+	#include <OpenGL/gl.h>
+	#include <OpenGL/glu.h>
+#else
 	#include <GL/gl.h>
 	#include <GL/glu.h>
 #endif
 
+#endif
+
 #include <engine/external/pnglite/pnglite.h>
 
 #include <base/system.h>
-- 
cgit 1.4.1