Fixes for non-native SDL builds on OS X [Paulo Cabral]

This commit is contained in:
R. Belmont 2011-04-16 02:28:11 +00:00
parent fa890c2507
commit eba03ea4c4
2 changed files with 12 additions and 0 deletions

View File

@ -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)

View File

@ -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