SDL: fix OS X compile with non-official SDL [R. Belmont, based on a patch by Fernando Lemos]

This commit is contained in:
R. Belmont 2014-04-13 16:38:54 +00:00
parent 771e6171f5
commit 1e197e432d
2 changed files with 3 additions and 3 deletions

View File

@ -45,8 +45,8 @@
#define APIENTRY #define APIENTRY
#endif #endif
#include "GL/gl.h" #include <OpenGL/gl.h>
#include "GL/glext.h" #include <OpenGL/glext.h>
typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum target); typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum target);
#endif #endif

View File

@ -478,7 +478,7 @@ else
INCPATH += `sdl-config --cflags | sed 's:/SDL::'` INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
CCOMFLAGS += -DNO_SDL_GLEXT CCOMFLAGS += -DNO_SDL_GLEXT
# Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m
LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -framework OpenGL
DEFS += -DMACOSX_USE_LIBSDL DEFS += -DMACOSX_USE_LIBSDL
endif # MACOSX_USE_LIBSDL endif # MACOSX_USE_LIBSDL