From ce2ff23fe090200b9b311807856ec8f791be13fc Mon Sep 17 00:00:00 2001 From: "Alex W. Jackson" Date: Mon, 20 Oct 2014 23:13:51 -0400 Subject: SDL: Allow SDL_LIBVER to be overridden without modifying sdl.mak --- src/osd/sdl/sdl.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index a328dc53037..e738fa8b523 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -83,19 +83,19 @@ SDL_FRAMEWORK_PATH = /Library/Frameworks/ OSDSRC = $(SRC)/osd OSDOBJ = $(OBJ)/osd -# auto-select SDL2 for non-OS/2 builds now +# default to SDL2 for non-OS/2 builds now +ifndef SDL_LIBVER ifneq ($(TARGETOS),os2) SDL_LIBVER = sdl2 +else +SDL_LIBVER = sdl +endif endif ifndef NO_USE_QTDEBUG OBJDIRS += $(OSDOBJ)/modules/debugger/qt endif -ifndef SDL_LIBVER -SDL_LIBVER = sdl -endif - ifdef SDL_INSTALL_ROOT SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config else -- cgit v1.2.3