actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Blah... dumb little screwups revolving around X11 and SDL.

Browse Source
This commit is contained in:
Ben Anderson
2005-03-15 00:41:05 +00:00
parent 3b65e3f438
commit e0e23c7b99
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Makefile.am
+3 -1
View File
@@ -161,10 +161,12 @@ if HAVE_SDL
# InputHandler_SDL depends on LowLevelWindow_SDL # InputHandler_SDL depends on LowLevelWindow_SDL
InputHandler += arch/InputHandler/InputHandler_SDL.cpp arch/InputHandler/InputHandler_SDL.h InputHandler += arch/InputHandler/InputHandler_SDL.cpp arch/InputHandler/InputHandler_SDL.h
LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_SDL.cpp arch/LowLevelWindow/LowLevelWindow_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 LoadingWindow += arch/LoadingWindow/LoadingWindow_SDL.cpp arch/LoadingWindow/LoadingWindow_SDL.h
StepMania += SDL_utils.cpp SDL_utils.h StepMania += SDL_utils.cpp SDL_utils.h
endif endif
endif
# Platform-specific drivers: # Platform-specific drivers:
stepmania/src/arch/InputHandler/Selector_InputHandler.h
+4 -5
View File
@@ -16,7 +16,10 @@
#include "InputHandler_MonkeyKeyboard.h" #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" #include "InputHandler_SDL.h"
#endif #endif
@@ -29,10 +32,6 @@
#include "InputHandler_Xbox.h" #include "InputHandler_Xbox.h"
#endif #endif
#ifdef HAVE_X11
#include "InputHandler_X11.h"
#endif
#endif #endif
/* /*