From 1e197e432d968d6933baec2f832ea6765c8ec225 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Sun, 13 Apr 2014 16:38:54 +0000 Subject: [PATCH] SDL: fix OS X compile with non-official SDL [R. Belmont, based on a patch by Fernando Lemos] --- src/osd/sdl/osd_opengl.h | 4 ++-- src/osd/sdl/sdl.mak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osd/sdl/osd_opengl.h b/src/osd/sdl/osd_opengl.h index c7709f76d03..73ef2071233 100644 --- a/src/osd/sdl/osd_opengl.h +++ b/src/osd/sdl/osd_opengl.h @@ -45,8 +45,8 @@ #define APIENTRY #endif - #include "GL/gl.h" - #include "GL/glext.h" + #include + #include typedef void (APIENTRY * PFNGLACTIVETEXTUREARBPROC) (GLenum target); #endif diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 819f465f356..9d92061ab3a 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -478,7 +478,7 @@ else 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 +LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -framework OpenGL DEFS += -DMACOSX_USE_LIBSDL endif # MACOSX_USE_LIBSDL