From 1b4f84d977dc7dc0b7de644974c325700d34cb2b Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 8 Jul 2004 00:14:57 +0000 Subject: [PATCH] update --- stepmania/src/Makefile.am | 5 +++-- stepmania/src/StepMania.dsp | 20 ++++++++++---------- stepmania/src/StepMania.vcproj | 12 ++++++------ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index da97c4384c..bff2e3eaa8 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -230,7 +230,7 @@ RageSoundPosMap.cpp RageSoundPosMap.h RageSoundReader.h RageSoundReader_FileRead RageSoundReader_Preload.cpp RageSoundReader_Preload.h RageSoundReader_Resample.cpp RageSoundReader_Resample.h \ RageSoundReader_Resample_Fast.cpp RageSoundReader_Resample_Fast.h \ RageSoundReader_Resample_Good.cpp RageSoundReader_Resample_Good.h \ -RageSoundResampler.cpp RageSoundResampler.h RageSounds.cpp RageSounds.h \ +RageSoundResampler.cpp RageSoundResampler.h \ RageSurface.cpp RageSurface.h RageSurfaceUtils.cpp RageSurfaceUtils.h \ RageSurface_Load.cpp RageSurface_Load.h RageSurface_Load_PNG.cpp RageSurface_Load_PNG.h \ RageSurface_Load_JPEG.cpp RageSurface_Load_JPEG.h RageSurface_Load_GIF.cpp RageSurface_Load_GIF.h \ @@ -248,7 +248,8 @@ ModelManager.cpp ModelManager.h ModelTypes.cpp ModelTypes.h Quad.h Sprite.cpp Sp GlobalSingletons = \ AnnouncerManager.cpp AnnouncerManager.h Bookkeeper.cpp Bookkeeper.h CryptManager.cpp CryptManager.h CryptHelpers.cpp CryptHelpers.h \ -FontManager.cpp FontManager.h GameManager.cpp GameManager.h GameState.cpp GameState.h InputFilter.cpp InputFilter.h \ +FontManager.cpp FontManager.h GameSoundManager.cpp GameSoundManager.h GameManager.cpp GameManager.h \ +GameState.cpp GameState.h InputFilter.cpp InputFilter.h \ InputMapper.cpp InputMapper.h InputQueue.cpp InputQueue.h LightsManager.cpp LightsManager.h \ MemoryCardManager.cpp MemoryCardManager.h NetworkSyncManager.cpp NetworkSyncManager.h \ NoteSkinManager.cpp NoteSkinManager.h PrefsManager.cpp PrefsManager.h ProfileManager.cpp ProfileManager.h \ diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index 03a7231cbf..6a88984fcd 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -62,7 +62,7 @@ IntDir=.\../Debug6 TargetDir=\temp\stepmania\Program TargetName=StepMania-debug SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -99,7 +99,7 @@ IntDir=.\../Release6 TargetDir=\temp\stepmania\Program TargetName=StepMania SOURCE="$(InputPath)" -PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ +PreLink_Cmds=disasm\verinc cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi # End Special Build Tool @@ -424,14 +424,6 @@ SOURCE=.\RageSoundResampler.h # End Source File # Begin Source File -SOURCE=.\RageSounds.cpp -# End Source File -# Begin Source File - -SOURCE=.\RageSounds.h -# End Source File -# Begin Source File - SOURCE=.\RageSurface.cpp # End Source File # Begin Source File @@ -2895,6 +2887,14 @@ SOURCE=.\GameManager.h # End Source File # Begin Source File +SOURCE=.\GameSoundManager.cpp +# End Source File +# Begin Source File + +SOURCE=.\GameSoundManager.h +# End Source File +# Begin Source File + SOURCE=.\GameState.cpp # End Source File # Begin Source File diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj index fe751b44a7..3871e6c599 100644 --- a/stepmania/src/StepMania.vcproj +++ b/stepmania/src/StepMania.vcproj @@ -1946,12 +1946,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - - @@ -2223,6 +2217,12 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ + + + +