From 92e49bcbddcfbeb9b8f739ed203c624ca9661235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Higor=20Eur=C3=ADpedes?= Date: Mon, 15 Sep 2014 22:13:54 -0300 Subject: [PATCH] Make sure SDL1 is disabled when SDL2 is active --- Makefile.common | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile.common b/Makefile.common index 20364f29c4..df0b67ba59 100644 --- a/Makefile.common +++ b/Makefile.common @@ -413,6 +413,10 @@ ifeq ($(HAVE_OPENGL), 1) DEFINES += -DHAVE_GLSL endif +ifeq ($(HAVE_SDL2), 1) + HAVE_SDL=0 +endif + ifeq ($(HAVE_SDL), 1) OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o