From e0e23c7b99b8b799126401ce0026a99ff5c94690 Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Tue, 15 Mar 2005 00:41:05 +0000 Subject: [PATCH] Blah... dumb little screwups revolving around X11 and SDL. --- stepmania/src/Makefile.am | 4 +++- stepmania/src/arch/InputHandler/Selector_InputHandler.h | 9 ++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 51414ef26d..511a841e8d 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -161,10 +161,12 @@ if HAVE_SDL # InputHandler_SDL depends on LowLevelWindow_SDL InputHandler += arch/InputHandler/InputHandler_SDL.cpp arch/InputHandler/InputHandler_SDL.h LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_SDL.cpp arch/LowLevelWindow/LowLevelWindow_SDL.h +endif +endif +if HAVE_SDL LoadingWindow += arch/LoadingWindow/LoadingWindow_SDL.cpp arch/LoadingWindow/LoadingWindow_SDL.h StepMania += SDL_utils.cpp SDL_utils.h endif -endif # Platform-specific drivers: diff --git a/stepmania/src/arch/InputHandler/Selector_InputHandler.h b/stepmania/src/arch/InputHandler/Selector_InputHandler.h index 2b5f9975c4..8393dfd19a 100644 --- a/stepmania/src/arch/InputHandler/Selector_InputHandler.h +++ b/stepmania/src/arch/InputHandler/Selector_InputHandler.h @@ -16,7 +16,10 @@ #include "InputHandler_MonkeyKeyboard.h" -#ifdef HAVE_SDL +// NOTE: If X11 is available, we don't use LLW_SDL, which IH_SDL depends on. +#ifdef HAVE_X11 +#include "InputHandler_X11.h" +#elif HAVE_SDL #include "InputHandler_SDL.h" #endif @@ -29,10 +32,6 @@ #include "InputHandler_Xbox.h" #endif -#ifdef HAVE_X11 -#include "InputHandler_X11.h" -#endif - #endif /*