diff --git a/stepmania/src/RageFileDriverDirect.cpp b/stepmania/src/RageFileDriverDirect.cpp index 51aefdaa3c..620ad280d7 100644 --- a/stepmania/src/RageFileDriverDirect.cpp +++ b/stepmania/src/RageFileDriverDirect.cpp @@ -14,7 +14,9 @@ #include #include #else +#if !defined(_XBOX) #include +#endif #include #endif diff --git a/stepmania/src/RageFileDriverDirectHelpers.cpp b/stepmania/src/RageFileDriverDirectHelpers.cpp index 8f1d00a8a3..e22c70e885 100644 --- a/stepmania/src/RageFileDriverDirectHelpers.cpp +++ b/stepmania/src/RageFileDriverDirectHelpers.cpp @@ -11,7 +11,9 @@ #include #include #else +#if !defined(_XBOX) #include +#endif #include #endif diff --git a/stepmania/src/RageFileDriverZip.cpp b/stepmania/src/RageFileDriverZip.cpp index 67fba1508f..b60c9b4a11 100644 --- a/stepmania/src/RageFileDriverZip.cpp +++ b/stepmania/src/RageFileDriverZip.cpp @@ -63,7 +63,7 @@ freely, subject to the following restrictions: #include -#if defined(_WINDOWS) +#if defined(_WINDOWS) || defined(_XBOX) #include "zlib/zlib.h" #pragma comment(lib, "zlib/zdll.lib") #else diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp index 5a30e4bf5c..1d856e76ca 100644 --- a/stepmania/src/RageLog.cpp +++ b/stepmania/src/RageLog.cpp @@ -20,7 +20,7 @@ #include "RageThreads.h" #include #include "ProductInfo.h" -#if defined(WIN32) && !defined(_XBOX) +#if defined(_WINDOWS) #include "windows.h" #endif #include diff --git a/stepmania/src/RageSoundReader_Vorbisfile.cpp b/stepmania/src/RageSoundReader_Vorbisfile.cpp index 1fdf895fb7..a3b6361250 100644 --- a/stepmania/src/RageSoundReader_Vorbisfile.cpp +++ b/stepmania/src/RageSoundReader_Vorbisfile.cpp @@ -11,7 +11,7 @@ #if defined(INTEGER_OGG) #include "tremor/ivorbisfile.h" #else -#include "vorbis/vorbisfile.h" +#include "vorbis/vorbis/vorbisfile.h" #endif #if defined(_XBOX) diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index cb8a0ca2fe..a5bc45d9a4 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -146,10 +146,10 @@ CString vssprintf( const char *fmt, va_list argList) } #ifdef WIN32 -#include "windows.h" #ifdef _XBOX #include "D3DX8Core.h" #else +#include "windows.h" #include "Dxerr8.h" #pragma comment(lib, "Dxerr8.lib") #endif diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index c8fa3b708c..3db27fdf1c 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -62,10 +62,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # Begin Special Build Tool IntDir=.\../Debug6 -TargetDir=\stepmania\stepmania\Program +TargetDir=\CVS\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,11 +99,11 @@ XBCP=xbecopy.exe # ADD XBCP /NOLOGO # Begin Special Build Tool IntDir=.\Debug -TargetDir=\stepmania\stepmania +TargetDir=\CVS\stepmania TargetName=default 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 ia32.vdi # End Special Build Tool @@ -140,10 +140,10 @@ LINK32=link.exe # SUBTRACT LINK32 /verbose /pdb:none # Begin Special Build Tool IntDir=.\../Release6 -TargetDir=\stepmania\itg\Program +TargetDir=\CVS\itg\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 @@ -181,11 +181,11 @@ XBCP=xbecopy.exe # ADD XBCP /NOLOGO # Begin Special Build Tool IntDir=.\StepMania___Xbox_Release -TargetDir=\stepmania\stepmania +TargetDir=\CVS\stepmania TargetName=default 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 ia32.vdi # End Special Build Tool @@ -1897,8 +1897,6 @@ SOURCE=.\arch\LoadingWindow\LoadingWindow_SDL.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -1949,8 +1947,6 @@ SOURCE=.\arch\Sound\DSoundHelpers.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -1974,8 +1970,6 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -1995,8 +1989,6 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -2205,6 +2197,8 @@ SOURCE=.\arch\InputHandler\InputHandler_Win32_Para.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -2447,6 +2441,8 @@ SOURCE=.\arch\Lights\LightsDriver_Win32Parallel.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -2478,6 +2474,8 @@ SOURCE=.\arch\MemoryCard\MemoryCardDriver_Windows.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" @@ -2633,6 +2631,8 @@ SOURCE=.\archutils\Win32\RestartProgram.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release" diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h index 04b95b4738..97760d6f7f 100644 --- a/stepmania/src/StepMania.h +++ b/stepmania/src/StepMania.h @@ -21,7 +21,7 @@ void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame=true ); void SaveGamePrefsToDisk(); void ChangeCurrentGame( Game g ); -#if defined(WIN32) +#if defined(_WINDOWS) #include "windows.h" extern HWND g_hWndMain; #endif diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp index 9264d3d891..e8cda015e3 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp @@ -2,6 +2,7 @@ #include "SDL_utils.h" #include "SDL_image.h" +#include "SDL_video.h" #include "SDL_rotozoom.h" #include "LoadingWindow_SDL.h" #include "loading.xpm" diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp index 6784452743..65ce8a04a7 100644 --- a/stepmania/src/arch/Sound/DSoundHelpers.cpp +++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp @@ -3,7 +3,9 @@ #include "../../RageUtil.h" #include "../../RageLog.h" +#if defined(_WINDOWS) #include +#endif #define DIRECTSOUND_VERSION 0x0700 #include diff --git a/stepmania/src/arch/Sound/DSoundHelpers.h b/stepmania/src/arch/Sound/DSoundHelpers.h index 4adfc8d03c..484d1577b9 100644 --- a/stepmania/src/arch/Sound/DSoundHelpers.h +++ b/stepmania/src/arch/Sound/DSoundHelpers.h @@ -2,8 +2,10 @@ #define DSOUND_HELPERS 1 #include "SDL.h" +#if defined(_WINDOWS) #include "windows.h" #include "wtypes.h" +#endif struct IDirectSound; struct IDirectSoundBuffer;