From 770c39296e3bf835625cada9aeb7932fb0114089 Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Thu, 21 Apr 2005 21:57:10 +0000 Subject: [PATCH] Revert; LowLevelWindow_X11 and LowLevelWindow_SDL *are* mutually exclusive (all LowLevelWindows are; see Selector_LowLevelWindow.h, arch.cpp, etc.). Also trivial fixes. --- stepmania/src/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index fb20304e9d..51c78ed4b6 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -154,12 +154,13 @@ if HAVE_X11 InputHandler += arch/InputHandler/InputHandler_X11.cpp arch/InputHandler/InputHandler_X11.h LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_X11.cpp arch/LowLevelWindow/LowLevelWindow_X11.h ArchUtils += archutils/Unix/X11Helper.cpp archutils/Unix/X11Helper.h -endif +else 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 @@ -211,7 +212,7 @@ endif ActorsInGameplayAndMenus = \ BGAnimation.cpp BGAnimation.h BGAnimationLayer.cpp BGAnimationLayer.h Banner.cpp Banner.h \ ConditionalBGA.cpp ConditionalBGA.h DifficultyIcon.cpp DifficultyIcon.h \ -MeterDisplay.cpp MeterDisplay.h StreamDisplay.cpp StreamDisplay.h +MeterDisplay.cpp MeterDisplay.h StreamDisplay.cpp StreamDisplay.h \ Transition.cpp Transition.h ActorsInMenus = \ @@ -245,7 +246,7 @@ ReceptorArrow.cpp ReceptorArrow.h ReceptorArrowRow.cpp ReceptorArrowRow.h \ ScoreDisplay.cpp ScoreDisplay.h \ ScoreDisplayBattle.cpp ScoreDisplayBattle.h \ ScoreDisplayCalories.cpp ScoreDisplayCalories.h \ -ScoreDisplayLifeTime.cpp ScoreDisplayLifeTime.h +ScoreDisplayLifeTime.cpp ScoreDisplayLifeTime.h \ ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp ScoreDisplayOni.h \ ScoreDisplayPercentage.cpp ScoreDisplayPercentage.h ScoreDisplayRave.cpp ScoreDisplayRave.h