diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 506dc04c9c..2dd88911bc 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -10,8 +10,7 @@ else AM_CXXFLAGS += -DLINUX -DDATADIR=\"$(datadir)\" endif -AM_CXXFLAGS += -O2 -AM_CXXFLAGS += -ISDL-1.2.5/include -ISDL_sound-1.0.0 +AM_CXXFLAGS += -O2 -ISDL-1.2.5/include -ISDL_sound-1.0.0 AM_CFLAGS += -O2 # This is a little hacky; we use our own version of SDL and SDL_sound, and I don't @@ -25,20 +24,9 @@ SDL-1.2.5/src/.libs/libSDL.a: SDL_sound-1.0.0/.libs/libSDL_sound.a: cd SDL_sound-1.0.0 && ./configure \ - --enable-wav \ - --enable-madlib \ - --enable-ogg \ - --disable-aiff \ - --disable-au \ - --disable-voc \ - --disable-raw \ - --disable-shn \ - --disable-midi \ - --disable-flac \ - --disable-smpeg \ - --disable-mpglib \ - --disable-mikmod \ - --disable-modplug \ + --enable-wav --enable-madlib --enable-ogg --disable-aiff --disable-au \ + --disable-voc --disable-raw --disable-shn --disable-midi --disable-flac \ + --disable-smpeg --disable-mpglib --disable-mikmod --disable-modplug \ --enable-static --disable-shared make -C SDL_sound-1.0.0 @@ -47,28 +35,29 @@ SDL_sound-1.0.0/.libs/libSDL_sound.a: RageHelpers = SDL_dither.cpp SDL_dither.h SDL_rotozoom.cpp SDL_rotozoom.h SDL_utils.cpp SDL_utils.h Rage = $(RageHelpers) \ -RageBitmapTexture.cpp RageBitmapTexture.h RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h RageDisplayInternal.h \ -RageException.cpp RageException.h RageFile.cpp RageFile.h RageInput.cpp RageInput.h RageInputDevice.cpp RageInputDevice.h \ -RageLog.cpp RageLog.h RageMath.cpp RageMath.h RageSound.cpp RageSound.h \ +RageBitmapTexture.cpp RageBitmapTexture.h RageDisplay.cpp RageDisplay.h RageDisplay_OGL.cpp RageDisplay_OGL.h \ +RageDisplayInternal.h RageException.cpp RageException.h RageFile.cpp RageFile.h RageInput.cpp RageInput.h \ +RageInputDevice.cpp RageInputDevice.h RageLog.cpp RageLog.h RageMath.cpp RageMath.h RageSound.cpp RageSound.h \ RageSoundManager.cpp RageSoundManager.h RageSoundReader.h RageSoundReader_SDL_Sound.cpp RageSoundReader_SDL_Sound.h \ RageTexture.cpp RageTexture.h RageTextureManager.cpp RageTextureManager.h RageThreads.cpp RageThreads.h \ RageTimer.cpp RageTimer.h RageTypes.h RageUtil_FileDB.cpp RageUtil_FileDB.h RageUtil.cpp RageUtil.h \ RageUtil_CharConversions.cpp RageUtil_CharConversions.h RageSoundReader_Preload.cpp RageSoundReader_Preload.h \ -RageSoundResampler.cpp RageSoundResampler.h RageSoundReader_Resample.cpp RageSoundReader_Resample.h RageSoundReader_FileReader.h \ -RageSounds.cpp RageSounds.h +RageSoundResampler.cpp RageSoundResampler.h RageSoundReader_Resample.cpp RageSoundReader_Resample.h \ +RageSoundReader_FileReader.h RageSounds.cpp RageSounds.h DataStructures = \ CodeDetector.cpp CodeDetector.h Course.cpp Course.h Font.cpp Font.h FontCharAliases.cpp FontCharAliases.h \ FontCharmaps.cpp FontCharmaps.h GameConstantsAndTypes.cpp GameConstantsAndTypes.h GameDef.cpp GameDef.h \ -GameInput.cpp GameInput.h GameTypes.h Grade.cpp Grade.h NoteData.cpp NoteData.h NoteDataWithScoring.cpp \ -NoteDataWithScoring.h NoteDataUtil.cpp NoteDataUtil.h Steps.cpp Steps.h NotesLoader.cpp NotesLoader.h NotesLoaderBMS.cpp NotesLoaderBMS.h \ -NotesLoaderDWI.cpp NotesLoaderDWI.h NotesLoaderKSF.cpp NotesLoaderKSF.h NotesLoaderSM.cpp NotesLoaderSM.h \ -NotesWriterDWI.cpp NotesWriterDWI.h NotesWriterSM.cpp NotesWriterSM.h NoteTypes.cpp NoteTypes.h Player.cpp Player.h \ -PlayerOptions.cpp PlayerOptions.h RandomSample.cpp RandomSample.h Song.cpp song.h SongCacheIndex.cpp SongCacheIndex.h \ -SongOptions.cpp SongOptions.h StageStats.cpp StageStats.h StyleDef.cpp StyleDef.h StyleInput.h \ -TitleSubstitution.cpp TitleSubstitution.h Inventory.cpp Inventory.h PlayerNumber.cpp PlayerNumber.h \ -LyricsLoader.cpp LyricsLoader.h ModeChoice.cpp ModeChoice.h NoteFieldPositioning.cpp NoteFieldPositioning.h \ -PlayerAI.cpp PlayerAI.h Character.cpp Character.h ArrowBackdrop.cpp ArrowBackdrop.h +GameInput.cpp GameInput.h GameTypes.h Grade.cpp Grade.h NoteData.cpp NoteData.h \ +NoteDataWithScoring.cpp NoteDataWithScoring.h NoteDataUtil.cpp NoteDataUtil.h Steps.cpp Steps.h \ +NotesLoader.cpp NotesLoader.h NotesLoaderBMS.cpp NotesLoaderBMS.h NotesLoaderDWI.cpp NotesLoaderDWI.h \ +NotesLoaderKSF.cpp NotesLoaderKSF.h NotesLoaderSM.cpp NotesLoaderSM.h NotesWriterDWI.cpp NotesWriterDWI.h \ +NotesWriterSM.cpp NotesWriterSM.h NoteTypes.cpp NoteTypes.h Player.cpp Player.h PlayerOptions.cpp PlayerOptions.h \ +RandomSample.cpp RandomSample.h Song.cpp song.h SongCacheIndex.cpp SongCacheIndex.h SongOptions.cpp SongOptions.h \ +StageStats.cpp StageStats.h StyleDef.cpp StyleDef.h StyleInput.h TitleSubstitution.cpp TitleSubstitution.h \ +Inventory.cpp Inventory.h PlayerNumber.cpp PlayerNumber.h LyricsLoader.cpp LyricsLoader.h ModeChoice.cpp ModeChoice.h \ +NoteFieldPositioning.cpp NoteFieldPositioning.h PlayerAI.cpp PlayerAI.h Character.cpp Character.h \ +ArrowBackdrop.cpp ArrowBackdrop.h FileTypes = IniFile.cpp IniFile.h MsdFile.cpp MsdFile.h @@ -78,32 +67,33 @@ Transitions = Transition.cpp Transition.h Actors = \ Actor.cpp Actor.h ActorFrame.cpp ActorFrame.h BitmapText.cpp BitmapText.h Quad.h \ -Sprite.cpp Sprite.h ActorScroller.cpp ActorScroller.h ActorUtil.cpp ActorUtil.h Model.cpp Model.h mathlib.c mathlib.h ModelTypes.cpp ModelTypes.h +Sprite.cpp Sprite.h ActorScroller.cpp ActorScroller.h ActorUtil.cpp ActorUtil.h Model.cpp Model.h mathlib.c mathlib.h \ +ModelTypes.cpp ModelTypes.h ActorsInMenus = \ -Banner.cpp Banner.h BannerCache.cpp BannerCache.h BPMDisplay.cpp BPMDisplay.h CourseContentsList.cpp \ -CourseContentsList.h CourseEntryDisplay.cpp CourseEntryDisplay.h DifficultyIcon.cpp DifficultyIcon.h \ -DifficultyRating.cpp DifficultyRating.h EditCoursesMenu.cpp EditCoursesMenu.h EditMenu.cpp EditMenu.h \ -FadingBanner.cpp FadingBanner.h DifficultyMeter.cpp DifficultyMeter.h GradeDisplay.cpp GradeDisplay.h GrooveRadar.cpp \ -GrooveRadar.h GroupList.cpp GroupList.h JukeboxMenu.cpp JukeboxMenu.h MenuElements.cpp MenuElements.h \ -MenuTimer.cpp MenuTimer.h MusicBannerWheel.cpp MusicBannerWheel.h MusicList.cpp MusicList.h MusicSortDisplay.cpp \ -MusicSortDisplay.h MusicWheel.cpp MusicWheel.h MusicWheelItem.cpp MusicWheelItem.h OptionIcon.cpp OptionIcon.h \ -OptionIconRow.cpp OptionIconRow.h OptionsCursor.cpp OptionsCursor.h ScrollBar.cpp ScrollBar.h ScrollingList.cpp \ -ScrollingList.h SnapDisplay.cpp SnapDisplay.h TextBanner.cpp TextBanner.h DifficultyDisplay.cpp DifficultyDisplay.h\ -HelpDisplay.cpp HelpDisplay.h WheelNotifyIcon.cpp WheelNotifyIcon.h GrooveGraph.cpp GrooveGraph.h \ -MeterDisplay.cpp MeterDisplay.h +Banner.cpp Banner.h BannerCache.cpp BannerCache.h BPMDisplay.cpp BPMDisplay.h CourseContentsList.cpp CourseContentsList.h \ +CourseEntryDisplay.cpp CourseEntryDisplay.h DifficultyIcon.cpp DifficultyIcon.h DifficultyRating.cpp DifficultyRating.h \ +EditCoursesMenu.cpp EditCoursesMenu.h EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \ +DifficultyMeter.cpp DifficultyMeter.h GradeDisplay.cpp GradeDisplay.h GrooveRadar.cpp GrooveRadar.h \ +GroupList.cpp GroupList.h JukeboxMenu.cpp JukeboxMenu.h MenuElements.cpp MenuElements.h MenuTimer.cpp MenuTimer.h \ +MusicBannerWheel.cpp MusicBannerWheel.h MusicList.cpp MusicList.h MusicSortDisplay.cpp MusicSortDisplay.h \ +MusicWheel.cpp MusicWheel.h MusicWheelItem.cpp MusicWheelItem.h OptionIcon.cpp OptionIcon.h \ +OptionIconRow.cpp OptionIconRow.h OptionsCursor.cpp OptionsCursor.h ScrollBar.cpp ScrollBar.h \ +ScrollingList.cpp ScrollingList.h SnapDisplay.cpp SnapDisplay.h TextBanner.cpp TextBanner.h \ +DifficultyDisplay.cpp DifficultyDisplay.h HelpDisplay.cpp HelpDisplay.h WheelNotifyIcon.cpp WheelNotifyIcon.h \ +GrooveGraph.cpp GrooveGraph.h MeterDisplay.cpp MeterDisplay.h ActorsInGameplay = \ -ArrowEffects.cpp ArrowEffects.h Background.cpp Background.h BGAnimation.cpp BGAnimation.h BGAnimationLayer.cpp \ -BGAnimationLayer.h Combo.cpp Combo.h GhostArrow.cpp GhostArrow.h \ -GhostArrowRow.cpp GhostArrowRow.h GrayArrow.cpp GrayArrow.h \ -GrayArrowRow.cpp GrayArrowRow.h HoldGhostArrow.cpp HoldGhostArrow.h HoldJudgment.cpp HoldJudgment.h \ -Judgment.cpp Judgment.h LifeMeter.h LifeMeterBar.cpp LifeMeterBar.h LifeMeterBattery.cpp \ -LifeMeterBattery.h CombinedLifeMeterTug.h CombinedLifeMeterTug.cpp \ -CombinedLifeMeterEnemy.h CombinedLifeMeterEnemy.cpp NoteDisplay.cpp NoteDisplay.h NoteField.cpp \ -NoteField.h ScoreDisplay.cpp ScoreDisplay.h ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp \ -ScoreDisplayOni.h ScoreKeeperRave.h ScoreKeeperRave.cpp ScoreKeeperMAX2.cpp ScoreKeeperMAX2.h ScoreDisplayBattle.cpp \ -ScoreDisplayBattle.h ActiveItemList.cpp ActiveItemList.h LyricDisplay.cpp LyricDisplay.h \ +ArrowEffects.cpp ArrowEffects.h Background.cpp Background.h BGAnimation.cpp BGAnimation.h \ +BGAnimationLayer.cpp BGAnimationLayer.h Combo.cpp Combo.h GhostArrow.cpp GhostArrow.h \ +GhostArrowRow.cpp GhostArrowRow.h GrayArrow.cpp GrayArrow.h GrayArrowRow.cpp GrayArrowRow.h \ +HoldGhostArrow.cpp HoldGhostArrow.h HoldJudgment.cpp HoldJudgment.h Judgment.cpp Judgment.h \ +LifeMeter.h LifeMeterBar.cpp LifeMeterBar.h LifeMeterBattery.cpp LifeMeterBattery.h \ +CombinedLifeMeterTug.h CombinedLifeMeterTug.cpp CombinedLifeMeterEnemy.h CombinedLifeMeterEnemy.cpp \ +NoteDisplay.cpp NoteDisplay.h NoteField.cpp NoteField.h ScoreDisplay.cpp ScoreDisplay.h \ +ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp ScoreDisplayOni.h ScoreKeeper.h \ +ScoreKeeper5th.cpp ScoreKeeper5th.h ScoreKeeperMAX2.cpp ScoreKeeperMAX2.h ScoreKeeperRave.cpp ScoreKeeperRave.h \ +ScoreDisplayBattle.cpp ScoreDisplayBattle.h ActiveItemList.cpp ActiveItemList.h LyricDisplay.cpp LyricDisplay.h \ TimingAssist.cpp TimingAssist.h ScoreDisplayRave.cpp ScoreDisplayRave.h DancingCharacters.cpp DancingCharacters.h \ ProTimingDisplay.cpp ProTimingDisplay.h @@ -112,93 +102,76 @@ Screen.cpp Screen.h ScreenAlbums.cpp ScreenAlbums.h ScreenAppearanceOptions.cpp ScreenAttract.cpp ScreenAttract.h ScreenCaution.cpp ScreenCaution.h ScreenCompany.h \ ScreenDemonstration.cpp ScreenDemonstration.h ScreenEdit.cpp ScreenEdit.h ScreenEditCoursesMenu.cpp ScreenEditCoursesMenu.h \ ScreenEditMenu.cpp ScreenEditMenu.h ScreenEvaluation.cpp ScreenEvaluation.h ScreenEz2SelectMusic.cpp ScreenEz2SelectMusic.h \ -ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h ScreenGameOver.cpp ScreenGameOver.h ScreenGameplay.cpp \ -ScreenGameplay.h ScreenGameplayOptions.cpp ScreenGameplayOptions.h ScreenGraphicOptions.cpp \ -ScreenGraphicOptions.h ScreenHowToPlay.cpp ScreenHowToPlay.h ScreenInputOptions.cpp ScreenInputOptions.h ScreenInstructions.cpp \ -ScreenInstructions.h ScreenIntroMovie.cpp ScreenIntroMovie.h ScreenJukebox.cpp ScreenJukebox.h ScreenJukeboxMenu.cpp \ -ScreenJukeboxMenu.h ScreenLogo.cpp ScreenLogo.h ScreenMachineOptions.cpp ScreenMachineOptions.h ScreenManager.cpp \ -ScreenManager.h ScreenMapControllers.cpp ScreenMapControllers.h ScreenMemoryCard.h ScreenMessage.h \ +ScreenEz2SelectPlayer.cpp ScreenEz2SelectPlayer.h ScreenGameOver.cpp ScreenGameOver.h ScreenGameplay.cpp ScreenGameplay.h \ +ScreenGameplayOptions.cpp ScreenGameplayOptions.h ScreenGraphicOptions.cpp ScreenGraphicOptions.h \ +ScreenHowToPlay.cpp ScreenHowToPlay.h ScreenInputOptions.cpp ScreenInputOptions.h \ +ScreenInstructions.cpp ScreenInstructions.h ScreenIntroMovie.cpp ScreenIntroMovie.h ScreenJukebox.cpp ScreenJukebox.h \ +ScreenJukeboxMenu.cpp ScreenJukeboxMenu.h ScreenLogo.cpp ScreenLogo.h ScreenMachineOptions.cpp ScreenMachineOptions.h \ +ScreenManager.cpp ScreenManager.h ScreenMapControllers.cpp ScreenMapControllers.h ScreenMemoryCard.h ScreenMessage.h \ ScreenMusicScroll.cpp ScreenMusicScroll.h ScreenNameEntry.cpp ScreenNameEntry.h ScreenOptions.cpp ScreenOptions.h \ -ScreenOptionsMenu.cpp ScreenOptionsMenu.h ScreenPlayerOptions.cpp ScreenPlayerOptions.h ScreenPrompt.cpp \ -ScreenPrompt.h ScreenRanking.cpp ScreenRanking.h ScreenSandbox.cpp ScreenSandbox.h ScreenSelectCourse.cpp \ -ScreenSelect.cpp ScreenSelect.h ScreenSelectCourse.h ScreenSelectDifficulty.cpp \ -ScreenSelectDifficulty.h ScreenSelectDifficultyEX.cpp ScreenSelectDifficultyEX.h ScreenSelectGame.cpp \ -ScreenSelectGame.h ScreenSelectGroup.cpp ScreenSelectGroup.h ScreenSelectMode.cpp ScreenSelectMode.h \ -ScreenSelectMusic.cpp ScreenSelectMusic.h ScreenSelectStyle.cpp ScreenSelectStyle.h ScreenSelectStyle5th.cpp \ -ScreenSelectStyle5th.h ScreenSongOptions.cpp ScreenSongOptions.h ScreenStage.cpp ScreenStage.h \ -ScreenStyleSplash.cpp ScreenStyleSplash.h ScreenTest.cpp ScreenTest.h ScreenTestFonts.cpp ScreenTestFonts.h \ -ScreenTestSound.cpp ScreenTestSound.h ScreenTextEntry.cpp ScreenTextEntry.h ScreenTitleMenu.cpp ScreenTitleMenu.h \ -ScreenUnlock.h ScreenWarning.h ScreenMiniMenu.cpp ScreenMiniMenu.h ScreenSoundOptions.cpp ScreenSoundOptions.h \ +ScreenOptionsMenu.cpp ScreenOptionsMenu.h ScreenPlayerOptions.cpp ScreenPlayerOptions.h ScreenPrompt.cpp ScreenPrompt.h \ +ScreenRanking.cpp ScreenRanking.h ScreenSandbox.cpp ScreenSandbox.h ScreenSelectCourse.cpp \ +ScreenSelect.cpp ScreenSelect.h ScreenSelectCourse.h ScreenSelectDifficulty.cpp ScreenSelectDifficulty.h \ +ScreenSelectDifficultyEX.cpp ScreenSelectDifficultyEX.h ScreenSelectGame.cpp ScreenSelectGame.h \ +ScreenSelectGroup.cpp ScreenSelectGroup.h ScreenSelectMode.cpp ScreenSelectMode.h ScreenSelectMusic.cpp ScreenSelectMusic.h \ +ScreenSelectStyle.cpp ScreenSelectStyle.h ScreenSelectStyle5th.cpp ScreenSelectStyle5th.h \ +ScreenSongOptions.cpp ScreenSongOptions.h ScreenStage.cpp ScreenStage.h ScreenStyleSplash.cpp ScreenStyleSplash.h \ +ScreenTest.cpp ScreenTest.h ScreenTestFonts.cpp ScreenTestFonts.h ScreenTestSound.cpp ScreenTestSound.h \ +ScreenTextEntry.cpp ScreenTextEntry.h ScreenTitleMenu.cpp ScreenTitleMenu.h ScreenWarning.h \ +ScreenMiniMenu.cpp ScreenMiniMenu.h ScreenSoundOptions.cpp ScreenSoundOptions.h \ ScreenAutogenOptions.cpp ScreenAutogenOptions.h ScreenCredits.cpp ScreenCredits.h \ ScreenSelectCharacter.cpp ScreenSelectCharacter.h ScreenRaveOptions.cpp ScreenRaveOptions.h \ -ScreenBackgroundOptions.cpp ScreenBackgroundOptions.h ScreenUnlock.cpp ScreenUnlock.h ScreenSelectMaster.cpp \ -ScreenSelectMaster.h +ScreenBackgroundOptions.cpp ScreenBackgroundOptions.h ScreenUnlock.cpp ScreenUnlock.h \ +ScreenSelectMaster.cpp ScreenSelectMaster.h GlobalSingletons = \ AnnouncerManager.cpp AnnouncerManager.h FontManager.cpp FontManager.h GameManager.cpp GameManager.h \ GameState.cpp GameState.h InputFilter.cpp InputFilter.h InputMapper.cpp InputMapper.h InputQueue.cpp InputQueue.h \ -ModeSwitcher.cpp ModeSwitcher.h NoteSkinManager.cpp NoteSkinManager.h PrefsManager.cpp PrefsManager.h SongManager.cpp SongManager.h \ -ThemeManager.cpp ThemeManager.h UnlockSystem.cpp UnlockSystem.h StepmaniaTemplates.cpp +ModeSwitcher.cpp ModeSwitcher.h NoteSkinManager.cpp NoteSkinManager.h PrefsManager.cpp PrefsManager.h \ +SongManager.cpp SongManager.h ThemeManager.cpp ThemeManager.h UnlockSystem.cpp UnlockSystem.h StepmaniaTemplates.cpp PCRE = pcre/chartables.c pcre/get.c pcre/internal.h pcre/maketables.c pcre/pcre.c pcre/pcre.h pcre/study.c Hooks = arch/ArchHooks/ArchHooks.cpp arch/ArchHooks/ArchHooks.h \ arch/ArchHooks/ArchHooks_Unix.cpp arch/ArchHooks/ArchHooks_Unix.h -Sound = arch/Sound/RageSoundDriver_Null.cpp \ - arch/Sound/RageSoundDriver_Null.h +Sound = arch/Sound/RageSoundDriver_Null.cpp arch/Sound/RageSoundDriver_Null.h if HAVE_ALSA -Sound += arch/Sound/RageSoundDriver_ALSA9.cpp \ - arch/Sound/RageSoundDriver_ALSA9.h +Sound += arch/Sound/RageSoundDriver_ALSA9.cpp arch/Sound/RageSoundDriver_ALSA9.h endif 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 -Loading = arch/LoadingWindow/LoadingWindow_Null.h -Loading += arch/LoadingWindow/LoadingWindow_SDL.cpp \ - arch/LoadingWindow/LoadingWindow_SDL.h +Loading = arch/LoadingWindow/LoadingWindow_Null.h \ + arch/LoadingWindow/LoadingWindow_SDL.cpp arch/LoadingWindow/LoadingWindow_SDL.h if HAVE_GTK -Loading += arch/LoadingWindow/LoadingWindow_Gtk.cpp \ - arch/LoadingWindow/LoadingWindow_Gtk.h +Loading += arch/LoadingWindow/LoadingWindow_Gtk.cpp arch/LoadingWindow/LoadingWindow_Gtk.h endif -Input = arch/InputHandler/InputHandler.cpp \ - arch/InputHandler/InputHandler.h +Input = arch/InputHandler/InputHandler.cpp arch/InputHandler/InputHandler.h -Input += arch/InputHandler/InputHandler_SDL.cpp \ - arch/InputHandler/InputHandler_SDL.h +Input += arch/InputHandler/InputHandler_SDL.cpp arch/InputHandler/InputHandler_SDL.h -Movie = arch/MovieTexture/MovieTexture.cpp \ - arch/MovieTexture/MovieTexture.h \ - arch/MovieTexture/MovieTexture_Null.cpp \ - arch/MovieTexture/MovieTexture_Null.h +Movie = arch/MovieTexture/MovieTexture.cpp arch/MovieTexture/MovieTexture.h \ + arch/MovieTexture/MovieTexture_Null.cpp arch/MovieTexture/MovieTexture_Null.h -Window = arch/LowLevelWindow/LowLevelWindow.h -Window += arch/LowLevelWindow/LowLevelWindow_SDL.cpp \ - arch/LowLevelWindow/LowLevelWindow_SDL.h +Window = arch/LowLevelWindow/LowLevelWindow.h \ + arch/LowLevelWindow/LowLevelWindow_SDL.cpp arch/LowLevelWindow/LowLevelWindow_SDL.h ArchUtils = archutils/Unix/SignalHandler.cpp archutils/Unix/SignalHandler.h if USE_CRASH_HANDLER -ArchUtils += archutils/Unix/CrashHandler.cpp archutils/Unix/CrashHandlerChild.cpp \ - archutils/Unix/CrashHandler.h archutils/Unix/CrashHandlerInternal.h +ArchUtils += archutils/Unix/CrashHandler.cpp archutils/Unix/CrashHandler.h \ + archutils/Unix/CrashHandlerChild.cpp archutils/Unix/CrashHandlerInternal.h endif stepmania_SOURCES = $(Rage) $(DataStructures) $(FileTypes) $(StepMania) $(Transitions) \ $(Actors) $(ActorsInMenus) $(ActorsInGameplay) $(Screens) $(GlobalSingletons) \ - $(PCRE) \ - $(Hooks) \ - $(Loading) \ - $(Input) \ - $(Movie) \ - $(Sound) \ - $(Window) \ - arch/arch.cpp arch/arch.h \ - $(ArchUtils) + $(PCRE) $(Hooks) $(Loading) $(Input) $(Movie) $(Sound) $(Window) \ + arch/arch.cpp arch/arch.h $(ArchUtils) # Note that we still end up linking dynamically to the shared system library # for SDL_image. This is annoying, but it's not a major problem. The