diff options
| author | 2011-04-16 02:28:11 +0000 | |
|---|---|---|
| committer | 2011-04-16 02:28:11 +0000 | |
| commit | eba03ea4c4570697bed491a4ebbf7e80c9ef363e (patch) | |
| tree | cd0705177aeff7e8c8f12c9963bb07881bad090b | |
| parent | fa890c2507804baec5615527ddefae318878ecb2 (diff) | |
Fixes for non-native SDL builds on OS X [Paulo Cabral]
| -rw-r--r-- | src/osd/sdl/osd_opengl.h | 11 | ||||
| -rw-r--r-- | src/osd/sdl/sdl.mak | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/osd/sdl/osd_opengl.h b/src/osd/sdl/osd_opengl.h index 655ac01f0ad..a96dfc9ea85 100644 --- a/src/osd/sdl/osd_opengl.h +++ b/src/osd/sdl/osd_opengl.h @@ -32,6 +32,17 @@ #endif #ifdef USE_DISPATCH_GL +#ifdef MACOSX_USE_LIBSDL + #ifndef APIENTRY + #define APIENTRY + #endif + + #include "GL/gl.h" + #include "GL/glext.h" + + typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum target); +#endif + #define OSD_GL(ret,func,params) ret (APIENTRY *func) params; #define OSD_GL_UNUSED(ret,func,params) diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 3376f0e1e10..b38767ef955 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -420,6 +420,7 @@ INCPATH += `sdl-config --cflags | sed 's:/SDL::'` CCOMFLAGS += -DNO_SDL_GLEXT # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread +DEFS += -DMACOSX_USE_LIBSDL endif endif # Mac OS X |
