Commit d29c431e authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
parent dfa9c2a0

ui/Makefile.objs

+6 −1
Original line number Diff line number Diff line
@@ -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)

ui/sdl.c

+0 −3
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
#undef WIN32_LEAN_AND_MEAN



#include <SDL.h>



#if SDL_MAJOR_VERSION == 1

#include <SDL_syswm.h>



#include "qemu-common.h"
@@ -958,4 +956,3 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 


    atexit(sdl_cleanup);

}
 
#endif

ui/sdl2.c

+0 −3
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#undef WIN32_LEAN_AND_MEAN



#include <SDL.h>



#if SDL_MAJOR_VERSION == 2

#include <SDL_syswm.h>



#include "qemu-common.h"
@@ -912,4 +910,3 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 


    atexit(sdl_cleanup);

}
 
#endif