Merge pull request #60 from mbcoguno/libsdl2-osx

SDL: Fix build with non-framework SDL 2 issue on OS X [mbcoguno]
This commit is contained in:
R. Belmont 2014-12-06 16:55:29 -05:00
commit b868138445

View File

@ -506,10 +506,10 @@ else
# files (header files are #include "SDL/something.h", so the extra "/SDL"
# causes a significant problem)
INCPATH += `sdl-config --cflags | sed 's:/SDL::'`
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 -framework OpenGL
LIBS += `$(SDL_CONFIG) --libs | sed 's/-lSDLmain//'` -lpthread -framework Cocoa -framework OpenGL
DEFS += -DMACOSX_USE_LIBSDL
endif # MACOSX_USE_LIBSDL