| Previous | 199869 Revisions | Next |
| r29610 Sunday 13th April, 2014 at 16:38:54 UTC by R. Belmont |
|---|
| SDL: fix OS X compile with non-official SDL [R. Belmont, based on a patch by Fernando Lemos] |
| [src/osd/sdl] | osd_opengl.h sdl.mak |
| r29609 | r29610 | |
|---|---|---|
| 478 | 478 | INCPATH += `sdl-config --cflags | sed 's:/SDL::'` |
| 479 | 479 | CCOMFLAGS += -DNO_SDL_GLEXT |
| 480 | 480 | # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m |
| 481 | LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread | |
| 481 | LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -framework OpenGL | |
| 482 | 482 | DEFS += -DMACOSX_USE_LIBSDL |
| 483 | 483 | endif # MACOSX_USE_LIBSDL |
| 484 | 484 |
| r29609 | r29610 | |
|---|---|---|
| 45 | 45 | #define APIENTRY |
| 46 | 46 | #endif |
| 47 | 47 | |
| 48 | #include "GL/gl.h" | |
| 49 | #include "GL/glext.h" | |
| 48 | #include <OpenGL/gl.h> | |
| 49 | #include <OpenGL/glext.h> | |
| 50 | 50 | |
| 51 | 51 | typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum target); |
| 52 | 52 | #endif |
| Previous | 199869 Revisions | Next |