From d29c431edce6c0cd18fc5c4ecf31417c2569ae4a Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 11 Nov 2014 10:13:08 +0100 Subject: sdl: move version logic from source code to makefile Compile sdl.c / sdl2.c depending on CONFIG_SDLABI instead of compiling both and have version #ifdefs in the source code. Signed-off-by: Gerd Hoffmann Reviewed-by: Max Reitz --- ui/Makefile.objs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ui/Makefile.objs') diff --git a/ui/Makefile.objs b/ui/Makefile.objs index 801cba2675..b25e85f68e 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -16,7 +16,12 @@ common-obj-$(CONFIG_CURSES) += curses.o common-obj-$(CONFIG_VNC) += $(vnc-obj-y) common-obj-$(CONFIG_GTK) += gtk.o x_keymap.o -sdl.mo-objs := sdl.o sdl_zoom.o sdl2.o +ifeq ($(CONFIG_SDLABI),1.2) +sdl.mo-objs := sdl.o sdl_zoom.o +endif +ifeq ($(CONFIG_SDLABI),2.0) +sdl.mo-objs := sdl2.o +endif sdl.mo-cflags := $(SDL_CFLAGS) gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS) -- cgit v1.2.1