diff options
| author | Joel de Vahl <joel@stalverk80.se> | 2008-10-21 15:59:32 +0000 |
|---|---|---|
| committer | Joel de Vahl <joel@stalverk80.se> | 2008-10-21 15:59:32 +0000 |
| commit | 8edfa800280d49c51c56e044d75b0858c20ed0a2 (patch) | |
| tree | 1dca72b1783bcdc4f6ae44aca3c722d29014437c /src/engine/client | |
| parent | 39b0b6cbf85d8f1b4fe97ff9ad6939905a5bfc22 (diff) | |
| download | zcatch-8edfa800280d49c51c56e044d75b0858c20ed0a2.tar.gz zcatch-8edfa800280d49c51c56e044d75b0858c20ed0a2.zip | |
Use SDL on OSX
Diffstat (limited to 'src/engine/client')
| -rw-r--r-- | src/engine/client/ec_client.c | 4 | ||||
| -rw-r--r-- | src/engine/client/ec_gfx.c | 9 |
2 files changed, 13 insertions, 0 deletions
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> |