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

fix VC6 compile error

Browse Source
This commit is contained in:
Chris Danford
2004-03-19 03:53:19 +00:00
parent 03c9ff66e4
commit 31ae7c6fc0
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.dsp
+21 -2
View File
@@ -65,7 +65,7 @@ IntDir=.\../Debug6
TargetDir=\stepmania\stepmania\Program TargetDir=\stepmania\stepmania\Program
TargetName=StepMania-debug TargetName=StepMania-debug
SOURCE="$(InputPath)" 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 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
# End Special Build Tool # End Special Build Tool
@@ -142,7 +142,7 @@ IntDir=.\../Release6
TargetDir=\stepmania\stepmania\Program TargetDir=\stepmania\stepmania\Program
TargetName=StepMania TargetName=StepMania
SOURCE="$(InputPath)" 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 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi
# End Special Build Tool # End Special Build Tool
@@ -2156,6 +2156,25 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\arch\Sound\RageSoundDriver_Generic_Software.cpp
!IF "$(CFG)" == "StepMania - Win32 Debug"
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
!ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\arch\Sound\RageSoundDriver_Generic_Software.h
# End Source File
# Begin Source File
SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp
!IF "$(CFG)" == "StepMania - Win32 Debug" !IF "$(CFG)" == "StepMania - Win32 Debug"
stepmania/src/arch/Sound/RageSoundDriver_Generic_Software.cpp
+2 -2
View File
@@ -99,7 +99,7 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
/* Note that, until we call advance_read_pointer, we can safely write to p[0]. */ /* Note that, until we call advance_read_pointer, we can safely write to p[0]. */
const int frames_to_read = min( frames_left, p[0]->frames_in_buffer ); const int frames_to_read = min( frames_left, p[0]->frames_in_buffer );
mix.write( p[0]->p, frames_to_read * channels, s.volume, got_frames*channels ); mix.write( (Sint16*)p[0]->p, frames_to_read * channels, s.volume, got_frames*channels );
SOUNDMAN->CommitPlayingPosition( s.sound_id, frameno+got_frames, p[0]->position, frames_to_read ); SOUNDMAN->CommitPlayingPosition( s.sound_id, frameno+got_frames, p[0]->position, frames_to_read );
@@ -117,7 +117,7 @@ void RageSound_Generic_Software::Mix( int16_t *buf, int frames, int64_t frameno,
} }
memset( buf, 0, frames*bytes_per_frame ); memset( buf, 0, frames*bytes_per_frame );
mix.read( buf ); mix.read( (Sint16*)buf );
} }