From ad3e2c780acee470aedd8867cb31d3ba25674e86 Mon Sep 17 00:00:00 2001 From: Ben Anderson Date: Fri, 9 Jun 2006 04:01:18 +0000 Subject: [PATCH] Remove removed files, add added file. Once again works on Linux. --- stepmania/src/SConscript | 366 +++++++++++++++++++-------------------- 1 file changed, 179 insertions(+), 187 deletions(-) diff --git a/stepmania/src/SConscript b/stepmania/src/SConscript index e4b38e2c2b..434d9a5fc1 100644 --- a/stepmania/src/SConscript +++ b/stepmania/src/SConscript @@ -223,116 +223,110 @@ else: Exit(1) Screens = [ - "Screen.cpp", - "ScreenAttract.cpp", - "ScreenBookkeeping.cpp", - "ScreenCenterImage.cpp", - "ScreenCredits.cpp", - "ScreenDebugOverlay.cpp", - "ScreenDemonstration.cpp", - "ScreenEdit.cpp", - "ScreenEditMenu.cpp", - "ScreenEnding.cpp", - "ScreenEvaluation.cpp", - "ScreenExit.cpp", - "ScreenNetEvaluation.cpp", - "ScreenNetSelectMusic.cpp", - "ScreenNetSelectBase.cpp", - "ScreenNetRoom.cpp", - "ScreenEz2SelectMusic.cpp", - "ScreenEz2SelectPlayer.cpp", - "ScreenGameplay.cpp", - "ScreenGameplayLesson.cpp", - "ScreenGameplaySyncMachine.cpp", - "ScreenGameplayNormal.cpp", - "ScreenHowToPlay.cpp", - "ScreenInstructions.cpp", - "ScreenJoinMultiplayer.cpp", - "ScreenJukebox.cpp", - "ScreenMapControllers.cpp", - "ScreenMessage.cpp", - "ScreenMiniMenu.cpp", - "ScreenMusicScroll.cpp", - "ScreenNameEntry.cpp", - "ScreenNameEntryTraditional.cpp", - "ScreenOptions.cpp", - "ScreenOptionsEditCourse.cpp", - "ScreenOptionsEditCourseEntry.cpp", - "ScreenOptionsEditProfile.cpp", - "ScreenOptionsManageCourses.cpp", - "ScreenOptionsManageEditSteps.cpp", - "ScreenOptionsManageProfiles.cpp", - "ScreenOptionsMaster.cpp", - "ScreenOptionsMasterPrefs.cpp", - "ScreenOptionsMemoryCard.cpp", - "ScreenPackages.cpp", - "ScreenPlayerOptions.cpp", - "ScreenNetworkOptions.cpp", - "ScreenPrompt.cpp", - "ScreenRanking.cpp", - "ScreenReloadSongs.cpp", - "ScreenSandbox.cpp", - "ScreenSaveSync.cpp", - "ScreenServiceAction.cpp", - "ScreenStatsOverlay.cpp", - "ScreenSelect.cpp", - "ScreenSelectCharacter.cpp", - "ScreenSelectDifficulty.cpp", - "ScreenSelectGroup.cpp", - "ScreenSelectMaster.cpp", - "ScreenSelectMode.cpp", - "ScreenSelectMusic.cpp", - "ScreenSelectStyle.cpp", - "ScreenSyncOverlay.cpp", - "ScreenSystemLayer.cpp", - "ScreenSetTime.cpp", - "ScreenSongOptions.cpp", - "ScreenSplash.cpp", - "ScreenStage.cpp", - "ScreenTestFonts.cpp", - "ScreenTestInput.cpp", - "ScreenTestLights.cpp", - "ScreenTestSound.cpp", - "ScreenTextEntry.cpp", - "ScreenTitleMenu.cpp", - "ScreenUnlockBrowse.cpp", - "ScreenUnlockCelebrate.cpp", - "ScreenUnlockStatus.cpp", - "ScreenWithMenuElements.cpp", + "Screen.cpp", + "ScreenAttract.cpp", + "ScreenBookkeeping.cpp", + "ScreenCenterImage.cpp", + "ScreenCredits.cpp", + "ScreenDebugOverlay.cpp", + "ScreenDemonstration.cpp", + "ScreenEdit.cpp", + "ScreenEditMenu.cpp", + "ScreenEnding.cpp", + "ScreenEvaluation.cpp", + "ScreenExit.cpp", + "ScreenNetEvaluation.cpp", + "ScreenNetSelectMusic.cpp", + "ScreenNetSelectBase.cpp", + "ScreenNetRoom.cpp", + "ScreenEz2SelectMusic.cpp", + "ScreenEz2SelectPlayer.cpp", + "ScreenGameplay.cpp", + "ScreenGameplayLesson.cpp", + "ScreenGameplayNormal.cpp", + "ScreenHowToPlay.cpp", + "ScreenInstructions.cpp", + "ScreenJukebox.cpp", + "ScreenMapControllers.cpp", + "ScreenMessage.cpp", + "ScreenMiniMenu.cpp", + "ScreenMusicScroll.cpp", + "ScreenNameEntry.cpp", + "ScreenNameEntryTraditional.cpp", + "ScreenOptions.cpp", + "ScreenOptionsEditCourse.cpp", + "ScreenOptionsEditCourseEntry.cpp", + "ScreenOptionsEditProfile.cpp", + "ScreenOptionsManageCourses.cpp", + "ScreenOptionsManageEditSteps.cpp", + "ScreenOptionsManageProfiles.cpp", + "ScreenOptionsMaster.cpp", + "ScreenOptionsMasterPrefs.cpp", + "ScreenPackages.cpp", + "ScreenPlayerOptions.cpp", + "ScreenNetworkOptions.cpp", + "ScreenPrompt.cpp", + "ScreenRanking.cpp", + "ScreenReloadSongs.cpp", + "ScreenSandbox.cpp", + "ScreenSaveSync.cpp", + "ScreenServiceAction.cpp", + "ScreenStatsOverlay.cpp", + "ScreenSelect.cpp", + "ScreenSelectCharacter.cpp", + "ScreenSelectDifficulty.cpp", + "ScreenSelectGroup.cpp", + "ScreenSelectMaster.cpp", + "ScreenSelectMode.cpp", + "ScreenSelectMusic.cpp", + "ScreenSelectStyle.cpp", + "ScreenSyncOverlay.cpp", + "ScreenSystemLayer.cpp", + "ScreenSetTime.cpp", + "ScreenSongOptions.cpp", + "ScreenSplash.cpp", + "ScreenStage.cpp", + "ScreenTestFonts.cpp", + "ScreenTestInput.cpp", + "ScreenTestLights.cpp", + "ScreenTestSound.cpp", + "ScreenTextEntry.cpp", + "ScreenTitleMenu.cpp", + "ScreenUnlockStatus.cpp", + "ScreenWithMenuElements.cpp", ] DataStructures = [ - "ActorCommands.cpp", - "AdjustSync.cpp", - "Attack.cpp", - "AutoKeysounds.cpp", - "BackgroundUtil.cpp", - "BannerCache.cpp", - "CatalogXml.cpp", - "Character.cpp", - "CodeDetector.cpp", - "Command.cpp", - "CommonMetrics.cpp", - "Course.cpp", - "CourseLoaderCRS.cpp", - "CourseUtil.cpp", - "CourseWriterCRS.cpp", - "DateTime.cpp", - "Difficulty.cpp", - "EnumHelper.cpp", - "Font.cpp", - "FontCharAliases.cpp", - "FontCharmaps.cpp", - "Game.cpp", - "GameCommand.cpp", - "GameConstantsAndTypes.cpp", - "GameInput.cpp", - "Grade.cpp", - "HighScore.cpp", - "Inventory.cpp", - "LocalizedString.cpp", - "LuaBinding.cpp", - "LuaReference.cpp", + "ActorCommands.cpp", + "AdjustSync.cpp", + "Attack.cpp", + "AutoKeysounds.cpp", + "BackgroundUtil.cpp", + "BannerCache.cpp", + "CatalogXml.cpp", + "Character.cpp", + "CodeDetector.cpp", + "Command.cpp", + "CommonMetrics.cpp", + "Course.cpp", + "CourseLoaderCRS.cpp", + "CourseUtil.cpp", + "CourseWriterCRS.cpp", + "DateTime.cpp", + "Difficulty.cpp", + "EnumHelper.cpp", + "Font.cpp", + "FontCharAliases.cpp", + "FontCharmaps.cpp", + "Game.cpp", + "GameCommand.cpp", + "GameConstantsAndTypes.cpp", + "GameInput.cpp", + "Grade.cpp", + "HighScore.cpp", + "Inventory.cpp", + "LocalizedString.cpp", + "LuaReference.cpp", "LuaExpressionTransform.cpp", "LyricsLoader.cpp", "MenuInput.cpp", @@ -358,6 +352,7 @@ DataStructures = [ "Profile.cpp", "RandomSample.cpp", "RadarValues.cpp", + "RoomWheel.cpp", "ScreenDimensions.cpp", "ScoreKeeperNormal.cpp", "ScoreKeeperRave.cpp", @@ -488,6 +483,7 @@ if env['PLATFORM'] == 'posix': "archutils/Unix/SignalHandler.cpp", "archutils/Unix/CrashHandler.cpp", "archutils/Unix/CrashHandlerChild.cpp", + "archutils/Unix/CrashHandlerInternal.cpp", "archutils/Unix/Backtrace.cpp", "archutils/Unix/BacktraceNames.cpp", ] @@ -556,79 +552,76 @@ ActorsInGameplayAndMenus = [ ] ActorsInMenus = [ - "ActiveAttackList.cpp", - "BPMDisplay.cpp", - "ComboGraph.cpp", - "CourseContentsList.cpp", - "CourseEntryDisplay.cpp", - "DifficultyDisplay.cpp", - "DifficultyList.cpp", - "DifficultyMeter.cpp", - "DifficultyRating.cpp", - "DualScrollBar.cpp", - "EditMenu.cpp", - "FadingBanner.cpp", - "GradeDisplay.cpp", - "GraphDisplay.cpp", - "GrooveRadar.cpp", - "GroupList.cpp", - "HelpDisplay.cpp", - "MemoryCardDisplay.cpp", - "MenuTimer.cpp", - "ModeSwitcher.cpp", - "MusicBannerWheel.cpp", - "MusicList.cpp", - "MusicSortDisplay.cpp", - "MusicWheel.cpp", - "MusicWheelItem.cpp", - "OptionIcon.cpp", - "OptionIconRow.cpp", - "OptionRow.cpp", - "OptionsCursor.cpp", - "PaneDisplay.cpp", - "RoomWheel.cpp", - "ScrollBar.cpp", - "ScrollingList.cpp", - "SnapDisplay.cpp", - "TextBanner.cpp", - "WheelBase.cpp", - "WheelItemBase.cpp", - "WheelNotifyIcon.cpp", + "ActiveAttackList.cpp", + "BPMDisplay.cpp", + "ComboGraph.cpp", + "CourseContentsList.cpp", + "CourseEntryDisplay.cpp", + "DifficultyDisplay.cpp", + "DifficultyList.cpp", + "DifficultyMeter.cpp", + "DifficultyRating.cpp", + "DualScrollBar.cpp", + "EditMenu.cpp", + "FadingBanner.cpp", + "GradeDisplay.cpp", + "GraphDisplay.cpp", + "GrooveRadar.cpp", + "GroupList.cpp", + "HelpDisplay.cpp", + "MemoryCardDisplay.cpp", + "MenuTimer.cpp", + "ModeSwitcher.cpp", + "MusicBannerWheel.cpp", + "MusicList.cpp", + "MusicSortDisplay.cpp", + "MusicWheel.cpp", + "MusicWheelItem.cpp", + "OptionIcon.cpp", + "OptionIconRow.cpp", + "OptionRow.cpp", + "OptionsCursor.cpp", + "PaneDisplay.cpp", + "ScrollBar.cpp", + "ScrollingList.cpp", + "SnapDisplay.cpp", + "TextBanner.cpp", + "WheelBase.cpp", + "WheelItemBase.cpp", + "WheelNotifyIcon.cpp", ] ActorsInGameplay = [ - "ArrowEffects.cpp", - "AttackDisplay.cpp", - "Background.cpp", - "BeginnerHelper.cpp", - "CombinedLifeMeterTug.cpp", - "Combo.cpp", - "DancingCharacters.cpp", - "Foreground.cpp", - "GhostArrowRow.cpp", - "HoldJudgment.cpp", - "Judgment.cpp", - "LifeMeter.cpp", - "LifeMeterBar.cpp", - "LifeMeterBattery.cpp", - "LifeMeterTime.cpp", - "LyricDisplay.cpp", - "NoteDisplay.cpp", - "NoteField.cpp", - "PercentageDisplay.cpp", - "Player.cpp", - "PlayerScoreList.cpp", - "ReceptorArrow.cpp", - "ReceptorArrowRow.cpp", - "ScoreDisplay.cpp", - "ScoreDisplayAliveTime.cpp", - "ScoreDisplayBattle.cpp", - "ScoreDisplayCalories.cpp", - "ScoreDisplayLifeTime.cpp", - "ScoreDisplayNormal.cpp", - "ScoreDisplayOni.cpp", - "ScoreDisplayPercentage.cpp", - "ScoreDisplayRave.cpp", + "ArrowEffects.cpp", + "AttackDisplay.cpp", + "Background.cpp", + "BeginnerHelper.cpp", + "CombinedLifeMeterTug.cpp", + "Combo.cpp", + "DancingCharacters.cpp", + "Foreground.cpp", + "GhostArrowRow.cpp", + "HoldJudgment.cpp", + "Judgment.cpp", + "LifeMeter.cpp", + "LifeMeterBar.cpp", + "LifeMeterBattery.cpp", + "LifeMeterTime.cpp", + "LyricDisplay.cpp", + "NoteDisplay.cpp", + "NoteField.cpp", + "PercentageDisplay.cpp", + "Player.cpp", + "ReceptorArrow.cpp", + "ReceptorArrowRow.cpp", + "ScoreDisplay.cpp", + "ScoreDisplayBattle.cpp", + "ScoreDisplayCalories.cpp", + "ScoreDisplayLifeTime.cpp", + "ScoreDisplayNormal.cpp", + "ScoreDisplayOni.cpp", + "ScoreDisplayPercentage.cpp", + "ScoreDisplayRave.cpp", ] PCRE = [ @@ -729,6 +722,7 @@ GlobalSingletons = [ "InputFilter.cpp", "InputMapper.cpp", "InputQueue.cpp", + "LuaBinding.cpp", "LuaManager.cpp", "LightsManager.cpp", "MemoryCardManager.cpp", @@ -750,16 +744,14 @@ Screens += [ "ScreenSMOnlineLogin.cpp" ] GlobalSingletons += [ "ezsockets.cpp" ] crypto = [ - "crypto/CryptBn.cpp", - "crypto/CryptHelpers.cpp" - "crypto/CryptMD5.cpp", - "crypto/CryptNoise.cpp", - "crypto/CryptPrime.cpp", - "crypto/CryptRand.cpp", - "crypto/CryptRSA.cpp", - "crypto/CryptRand.cpp", - "crypto/CryptSH512.cpp", - "crypto/CryptSHA.cpp", + "crypto/CryptBn.cpp", + "crypto/CryptMD5.cpp", + "crypto/CryptNoise.cpp", + "crypto/CryptPrime.cpp", + "crypto/CryptRSA.cpp", + "crypto/CryptRand.cpp", + "crypto/CryptSH512.cpp", + "crypto/CryptSHA.cpp", ] cryptopp = [