Partial overhaul. Moved all drivers into one place and indented bodies of if statements to make things easier to read.
This commit is contained in:
Ben "root" Anderson
+117
-60
@@ -205,21 +205,55 @@ global.cpp global.h \
|
|||||||
SpecialFiles.cpp SpecialFiles.h \
|
SpecialFiles.cpp SpecialFiles.h \
|
||||||
ProductInfo.h
|
ProductInfo.h
|
||||||
|
|
||||||
LoadingWindow = arch/LoadingWindow/LoadingWindow.cpp \
|
ArchHooks = arch/ArchHooks/ArchHooks.cpp arch/ArchHooks/ArchHooks.h \
|
||||||
arch/LoadingWindow/LoadingWindow.h \
|
arch/ArchHooks/ArchHooksUtil.cpp
|
||||||
arch/LoadingWindow/LoadingWindow_Null.h
|
|
||||||
|
|
||||||
if HAVE_GTK
|
ArchUtils =
|
||||||
LoadingWindow += arch/LoadingWindow/LoadingWindow_Gtk.cpp arch/LoadingWindow/LoadingWindow_Gtk.h \
|
|
||||||
arch/LoadingWindow/LoadingWindow_GtkModule.h
|
Dialog = arch/Dialog/Dialog.cpp arch/Dialog/Dialog.h arch/Dialog/DialogDriver.h arch/Dialog/DialogDriver.cpp
|
||||||
endif
|
|
||||||
|
InputHandler = arch/InputHandler/InputHandler.cpp arch/InputHandler/InputHandler.h
|
||||||
|
|
||||||
|
Lights = arch/Lights/LightsDriver.cpp arch/Lights/LightsDriver.h
|
||||||
|
|
||||||
|
MemoryCard = arch/MemoryCard/MemoryCardDriver.cpp arch/MemoryCard/MemoryCardDriver.h
|
||||||
|
|
||||||
|
MovieTexture = arch/MovieTexture/MovieTexture.cpp arch/MovieTexture/MovieTexture.h
|
||||||
|
|
||||||
|
LoadingWindow = arch/LoadingWindow/LoadingWindow.cpp arch/LoadingWindow/LoadingWindow.h
|
||||||
|
|
||||||
|
LowLevelWindow = arch/LowLevelWindow/LowLevelWindow.cpp arch/LowLevelWindow/LowLevelWindow.h
|
||||||
|
|
||||||
Sound = arch/Sound/RageSoundDriver.h arch/Sound/RageSoundDriver.cpp \
|
Sound = arch/Sound/RageSoundDriver.h arch/Sound/RageSoundDriver.cpp \
|
||||||
arch/Sound/RageSoundDriver_Null.cpp arch/Sound/RageSoundDriver_Null.h \
|
|
||||||
arch/Sound/RageSoundDriver_Generic_Software.cpp
|
arch/Sound/RageSoundDriver_Generic_Software.cpp
|
||||||
|
|
||||||
if HAVE_PULSE
|
Threads = arch/Threads/Threads.h
|
||||||
Sound += arch/Sound/RageSoundDriver_PulseAudio.cpp arch/Sound/RageSoundDriver_PulseAudio.h
|
|
||||||
|
# ===================================
|
||||||
|
# (Potentially) multiplatform drivers
|
||||||
|
# ===================================
|
||||||
|
InputHandler += arch/InputHandler/InputHandler_MonkeyKeyboard.cpp arch/InputHandler/InputHandler_MonkeyKeyboard.h
|
||||||
|
|
||||||
|
Lights += arch/Lights/LightsDriver_Export.cpp arch/Lights/LightsDriver_Export.h \
|
||||||
|
arch/Lights/LightsDriver_SystemMessage.cpp arch/Lights/LightsDriver_SystemMessage.h
|
||||||
|
|
||||||
|
LoadingWindow += arch/LoadingWindow/LoadingWindow_Null.h
|
||||||
|
|
||||||
|
MemoryCard += arch/MemoryCard/MemoryCardDriver_Null.h
|
||||||
|
|
||||||
|
MovieTexture += arch/MovieTexture/MovieTexture_Generic.cpp arch/MovieTexture/MovieTexture_Generic.h \
|
||||||
|
arch/MovieTexture/MovieTexture_Null.cpp arch/MovieTexture/MovieTexture_Null.h
|
||||||
|
|
||||||
|
Sound += arch/Sound/RageSoundDriver_Null.cpp arch/Sound/RageSoundDriver_Null.h
|
||||||
|
|
||||||
|
if HAVE_FFMPEG
|
||||||
|
MovieTexture += arch/MovieTexture/MovieTexture_FFMpeg.cpp arch/MovieTexture/MovieTexture_FFMpeg.h
|
||||||
|
endif
|
||||||
|
|
||||||
|
if HAVE_GTK
|
||||||
|
# XXX We need a GTK DialogDriver for Linux
|
||||||
|
LoadingWindow += arch/LoadingWindow/LoadingWindow_Gtk.cpp arch/LoadingWindow/LoadingWindow_Gtk.h \
|
||||||
|
arch/LoadingWindow/LoadingWindow_GtkModule.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_JACK
|
if HAVE_JACK
|
||||||
@@ -230,8 +264,42 @@ if HAVE_OSS
|
|||||||
Sound += arch/Sound/RageSoundDriver_OSS.cpp arch/Sound/RageSoundDriver_OSS.h
|
Sound += arch/Sound/RageSoundDriver_OSS.cpp arch/Sound/RageSoundDriver_OSS.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if HAVE_PULSE
|
||||||
|
Sound += arch/Sound/RageSoundDriver_PulseAudio.cpp arch/Sound/RageSoundDriver_PulseAudio.h
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Yes, really. MinGW provides pthread.
|
||||||
|
if HAVE_PTHREAD
|
||||||
|
Threads += arch/Threads/Threads_Pthreads.cpp arch/Threads/Threads_Pthreads.h
|
||||||
|
endif
|
||||||
|
|
||||||
|
if HAVE_X11
|
||||||
|
# InputHandler_X11 depends on LowLevelWindow_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
|
||||||
|
|
||||||
|
# =========================
|
||||||
|
# Platform-specific drivers
|
||||||
|
# =========================
|
||||||
|
if UNIX
|
||||||
|
ArchHooks += arch/ArchHooks/ArchHooks_Unix.cpp arch/ArchHooks/ArchHooks_Unix.h
|
||||||
|
Threads += arch/Threads/Threads_Pthreads.cpp arch/Threads/Threads_Pthreads.h
|
||||||
|
|
||||||
|
if LINUX
|
||||||
|
InputHandler += arch/InputHandler/InputHandler_Linux_Joystick.cpp arch/InputHandler/InputHandler_Linux_Joystick.h \
|
||||||
|
arch/InputHandler/InputHandler_Linux_Event.cpp arch/InputHandler/InputHandler_Linux_Event.h \
|
||||||
|
arch/InputHandler/InputHandler_Linux_PIUIO.cpp arch/InputHandler/InputHandler_Linux_PIUIO.h
|
||||||
|
|
||||||
|
Lights += arch/Lights/LightsDriver_LinuxWeedTech.cpp arch/Lights/LightsDriver_LinuxWeedTech.h \
|
||||||
|
arch/Lights/LightsDriver_Linux_PIUIO.cpp arch/Lights/LightsDriver_Linux_PIUIO.h
|
||||||
|
|
||||||
|
MemoryCard += arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp arch/MemoryCard/MemoryCardDriverThreaded_Linux.h
|
||||||
|
|
||||||
if HAVE_ALSA
|
if HAVE_ALSA
|
||||||
Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h arch/Sound/ALSA9Functions.h \
|
Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h \
|
||||||
|
arch/Sound/ALSA9Functions.h \
|
||||||
arch/Sound/ALSA9Helpers.cpp arch/Sound/ALSA9Helpers.h \
|
arch/Sound/ALSA9Helpers.cpp arch/Sound/ALSA9Helpers.h \
|
||||||
arch/Sound/RageSoundDriver_ALSA9_Software.cpp arch/Sound/RageSoundDriver_ALSA9_Software.h
|
arch/Sound/RageSoundDriver_ALSA9_Software.cpp arch/Sound/RageSoundDriver_ALSA9_Software.h
|
||||||
|
|
||||||
@@ -240,52 +308,14 @@ Sound += arch/Sound/ALSA9Dynamic.cpp arch/Sound/ALSA9Dynamic.h arch/Sound/ALSA9F
|
|||||||
AM_CXXFLAGS += $(ALSA_CFLAGS)
|
AM_CXXFLAGS += $(ALSA_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ArchHooks = arch/ArchHooks/ArchHooks.cpp arch/ArchHooks/ArchHooks.h \
|
|
||||||
arch/ArchHooks/ArchHooksUtil.cpp
|
|
||||||
|
|
||||||
InputHandler = arch/InputHandler/InputHandler.cpp arch/InputHandler/InputHandler.h \
|
|
||||||
arch/InputHandler/InputHandler_MonkeyKeyboard.cpp arch/InputHandler/InputHandler_MonkeyKeyboard.h \
|
|
||||||
arch/InputHandler/InputHandler_Linux_PIUIO.cpp arch/InputHandler/InputHandler_Linux_PIUIO.h
|
|
||||||
|
|
||||||
MovieTexture = arch/MovieTexture/MovieTexture.cpp arch/MovieTexture/MovieTexture.h \
|
|
||||||
arch/MovieTexture/MovieTexture_Generic.cpp arch/MovieTexture/MovieTexture_Generic.h \
|
|
||||||
arch/MovieTexture/MovieTexture_Null.cpp arch/MovieTexture/MovieTexture_Null.h
|
|
||||||
|
|
||||||
if HAVE_FFMPEG
|
|
||||||
MovieTexture += arch/MovieTexture/MovieTexture_FFMpeg.cpp arch/MovieTexture/MovieTexture_FFMpeg.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
Lights = arch/Lights/LightsDriver.cpp arch/Lights/LightsDriver.h \
|
|
||||||
arch/Lights/LightsDriver_Export.cpp arch/Lights/LightsDriver_Export.h \
|
|
||||||
arch/Lights/LightsDriver_SystemMessage.cpp arch/Lights/LightsDriver_SystemMessage.h
|
|
||||||
|
|
||||||
MemoryCard = arch/MemoryCard/MemoryCardDriver.cpp arch/MemoryCard/MemoryCardDriver.h arch/MemoryCard/MemoryCardDriver_Null.h
|
|
||||||
LowLevelWindow = arch/LowLevelWindow/LowLevelWindow.cpp arch/LowLevelWindow/LowLevelWindow.h
|
|
||||||
|
|
||||||
ArchUtils =
|
|
||||||
|
|
||||||
Dialog = arch/Dialog/Dialog.cpp arch/Dialog/Dialog.h arch/Dialog/DialogDriver.h arch/Dialog/DialogDriver.cpp
|
|
||||||
|
|
||||||
Threads = arch/Threads/Threads.h
|
|
||||||
|
|
||||||
if HAVE_X11
|
|
||||||
# InputHandler_X11 depends on LowLevelWindow_X11
|
|
||||||
InputHandler += arch/InputHandler/InputHandler_X11.cpp arch/InputHandler/InputHandler_X11.h
|
|
||||||
LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_X11.cpp arch/LowLevelWindow/LowLevelWindow_X11.h
|
|
||||||
LowLevelWindow += archutils/Unix/X11Helper.cpp archutils/Unix/X11Helper.h
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Platform-specific drivers:
|
|
||||||
|
|
||||||
if UNIX
|
|
||||||
ArchHooks += arch/ArchHooks/ArchHooks_Unix.cpp arch/ArchHooks/ArchHooks_Unix.h
|
|
||||||
Threads += arch/Threads/Threads_Pthreads.cpp arch/Threads/Threads_Pthreads.h
|
|
||||||
if LINUX
|
|
||||||
Lights += arch/Lights/LightsDriver_LinuxWeedTech.cpp arch/Lights/LightsDriver_LinuxWeedTech.h \
|
|
||||||
arch/Lights/LightsDriver_Linux_PIUIO.cpp arch/Lights/LightsDriver_Linux_PIUIO.h
|
|
||||||
if HAVE_PARALLEL_PORT
|
if HAVE_PARALLEL_PORT
|
||||||
Lights += arch/Lights/LightsDriver_LinuxParallel.cpp arch/Lights/LightsDriver_LinuxParallel.h
|
Lights += arch/Lights/LightsDriver_LinuxParallel.cpp arch/Lights/LightsDriver_LinuxParallel.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if WITH_TTY
|
||||||
|
InputHandler += arch/InputHandler/InputHandler_Linux_tty.cpp arch/InputHandler/InputHandler_Linux_tty.h \
|
||||||
|
arch/InputHandler/InputHandler_Linux_tty_keys.h
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ArchUtils += archutils/Unix/AssertionHandler.cpp archutils/Unix/AssertionHandler.h \
|
ArchUtils += archutils/Unix/AssertionHandler.cpp archutils/Unix/AssertionHandler.h \
|
||||||
@@ -305,13 +335,42 @@ ArchUtils += archutils/Unix/Backtrace.cpp archutils/Unix/Backtrace.h \
|
|||||||
archutils/Unix/CrashHandlerChild.cpp archutils/Unix/CrashHandlerInternal.h \
|
archutils/Unix/CrashHandlerChild.cpp archutils/Unix/CrashHandlerInternal.h \
|
||||||
archutils/Unix/CrashHandlerInternal.cpp
|
archutils/Unix/CrashHandlerInternal.cpp
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
# =========================================
|
||||||
|
if WINDOWS
|
||||||
|
ArchHooks += arch/ArchHooks/ArchHooks_Win32.cpp arch/ArchHooks/ArchHooks_Win32.h \
|
||||||
|
arch/ArchHooks/ArchHooks_Win32Static.cpp
|
||||||
|
|
||||||
|
Dialog += arch/Dialog/DialogDriver_Win32.cpp arch/Dialog/DialogDriver_Win32.h
|
||||||
|
|
||||||
|
LoadingWindow += arch/LoadingWindow/LoadingWindow_Win32.cpp arch/LoadingWindow/LoadingWindow_Win32.h
|
||||||
|
|
||||||
|
LowLevelWindow += arch/LowLevelWindow/LowLevelWindow_Win32.cpp arch/LowLevelWindow/LowLevelWindow_Win32.h
|
||||||
|
|
||||||
|
MemoryCard += arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp arch/MemoryCard/MemoryCardDriverThreaded_Windows.h
|
||||||
|
|
||||||
|
# XXX We may want to ditch DirectShow in favor of using ffmpeg on all platforms.
|
||||||
|
MovieTexture += arch/MovieTexture/MovieTexture_DShow.cpp arch/MovieTexture/MovieTexture_DShow.h \
|
||||||
|
arch/MovieTexture/MovieTexture_DShowHelper.cpp arch/MovieTexture/MovieTexture_DShowHelper.h
|
||||||
|
|
||||||
|
# XXX: Do we want to detect DirectX SDK and selectively enable DirectX drivers?
|
||||||
|
InputHandler += arch/InputHandler/InputHandler_DirectInput.cpp arc/InputHandler/InputHandler_DirectInput.h \
|
||||||
|
arch/InputHandler/InputHandler_DirectInputHelper.cpp arch/InputHandler/InputHandler_DirectInputHelper.h \
|
||||||
|
arch/InputHandler/InputHandler_Win32_MIDI.cpp arch/InputHandler/InputHandler_Win32_MIDI.h \
|
||||||
|
arch/InputHandler/InputHandler_Win32_Para.cpp arch/InputHandler/InputHandler_Win32_Para.h \
|
||||||
|
arch/InputHandler/InputHandler_Win32_Pump.cpp arch/InputHandler/InputHandler_Win32_Pump.h
|
||||||
|
|
||||||
|
Sound += arch/Sound/RageSoundDriver_DSound_Software.cpp arch/Sound/RageSoundDriver_DSound_Software.h \
|
||||||
|
arch/Sound/RageSoundDriver_WaveOut.cpp arch/Sound/RageSoundDriver_WaveOut.h \
|
||||||
|
arch/Sound/RageSoundDriver_WDMKS.cpp arch/Sound/RageSoundDriver_WDMKS.h
|
||||||
|
|
||||||
|
if HAVE_PARALLEL_PORT
|
||||||
|
Lights += arch/Lights/LightsDriver_Win32Parallel.cpp arch/Lights/LightsDriver_Win32Parallel.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if LINUX
|
if !HAVE_PTHREAD
|
||||||
MemoryCard += arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp arch/MemoryCard/MemoryCardDriverThreaded_Linux.h
|
Threads += arch/Threads/Threads_Win32.cpp arch/Threads/Threads_Win32.h
|
||||||
InputHandler += arch/InputHandler/InputHandler_Linux_Joystick.cpp arch/InputHandler/InputHandler_Linux_Joystick.h
|
endif
|
||||||
InputHandler += arch/InputHandler/InputHandler_Linux_Event.cpp arch/InputHandler/InputHandler_Linux_Event.h
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
Arch = $(LoadingWindow) $(Sound) $(ArchHooks) $(InputHandler) $(MovieTexture) \
|
Arch = $(LoadingWindow) $(Sound) $(ArchHooks) $(InputHandler) $(MovieTexture) \
|
||||||
@@ -742,5 +801,3 @@ TESTS += test_threads
|
|||||||
test_threads_SOURCES = \
|
test_threads_SOURCES = \
|
||||||
$(all_test_SOURCES) \
|
$(all_test_SOURCES) \
|
||||||
tests/test_threads.cpp
|
tests/test_threads.cpp
|
||||||
|
|
||||||
INCLUDES =
|
|
||||||
|
|||||||
Reference in New Issue
Block a user