Purge SDL/GL context.

Conflicts: gfx/context/sdl_ctx.c
mme4crt · Jul 17, 2013 · c54af19 · c54af19
1 parent 81125ba
commit c54af19
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 376 deletions.
diff --git a/Makefile b/Makefile
@@ -183,10 +183,6 @@ ifeq ($(HAVE_SDL), 1)
    JOYCONFIG_OBJ += input/sdl_joypad.o
    DEFINES += $(SDL_CFLAGS) $(BSD_LOCAL_INC)
    LIBS += $(SDL_LIBS)
-
-   ifeq ($(HAVE_OPENGL), 1)
-      OBJ += gfx/context/sdl_ctx.o
-   endif
 endif
 
 ifeq ($(HAVE_OPENGL), 1)

diff --git a/Makefile.win b/Makefile.win
@@ -100,7 +100,7 @@ ifeq ($(HAVE_RGUI), 1)
 endif
 
 ifeq ($(HAVE_SDL), 1)
-   OBJ += gfx/sdl_gfx.o gfx/context/sdl_ctx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
+   OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
    JOBJ += input/sdl_joypad.o
    LIBS += -lSDL
    JLIBS += -lSDL

diff --git a/gfx/context/sdl_ctx.c b/gfx/context/sdl_ctx.c
diff --git a/gfx/gfx_context.c b/gfx/gfx_context.c
@@ -51,9 +51,6 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
 #if defined(IOS) || defined(OSX) //< Don't use __APPLE__ as it breaks basic SDL builds
    &gfx_ctx_apple,
 #endif
-#if defined(HAVE_SDL) && defined(HAVE_OPENGL)
-   &gfx_ctx_sdl_gl,
-#endif
 };
 
 const gfx_ctx_driver_t *gfx_ctx_find_driver(const char *ident)