diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp index 28e6de3713..31fc6e9998 100644 --- a/stepmania/src/Actor.cpp +++ b/stepmania/src/Actor.cpp @@ -19,7 +19,7 @@ #include "RageMath.h" #include "GameConstantsAndTypes.h" #include "RageLog.h" -#include "StepMania.h" +#include "arch/ArchHooks/ArchHooks.h" /* This is Reset instead of Init since many derived classes have Init() functions * that shouldn't change the position of the actor. */ diff --git a/stepmania/src/BGAnimationLayer.cpp b/stepmania/src/BGAnimationLayer.cpp index 3435c34b9f..a40ebe3bae 100644 --- a/stepmania/src/BGAnimationLayer.cpp +++ b/stepmania/src/BGAnimationLayer.cpp @@ -26,7 +26,7 @@ #include "Sprite.h" #include "RageDisplay.h" #include "ActorUtil.h" -#include "StepMania.h" // for HOOKS +#include "arch/ArchHooks/ArchHooks.h" #include "RageTextureManager.h" diff --git a/stepmania/src/Model.cpp b/stepmania/src/Model.cpp index 7495678bc7..022a721cc9 100644 --- a/stepmania/src/Model.cpp +++ b/stepmania/src/Model.cpp @@ -600,9 +600,6 @@ bool Model::LoadMilkshapeAsciiBones( CString sAniName, CString sPath ) return true; } -#include "SDL_opengl.h" -#include "RageTimer.h" - void Model::DrawPrimitives() { if(m_Meshes.empty()) diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp index 6fb49376a4..89aba1d593 100644 --- a/stepmania/src/RageBitmapTexture.cpp +++ b/stepmania/src/RageBitmapTexture.cpp @@ -18,7 +18,7 @@ #include "RageException.h" #include "RageDisplay.h" #include "RageTypes.h" -#include "StepMania.h" // yuck. Needed for HOOKS. +#include "arch/ArchHooks/ArchHooks.h" #include "SDL.h" #include "SDL_image.h" diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index 73c7b55807..e3b423b0c9 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -28,7 +28,7 @@ #include "D3dx8math.h" #include "SDL_video.h" // for SDL_Surface #include "SDL_utils.h" -#include "Dxerr8.h" +#include "D3DX8Core.h" #include "arch/arch.h" @@ -38,12 +38,20 @@ #endif // load Windows D3D8 dynamically #pragma comment(lib, "D3dx8.lib") -#pragma comment(lib, "Dxerr8.lib") +//#pragma comment(lib, "Dxerr8.lib") #include #include +CString GetErrorString( HRESULT hr ) +{ + char szError[1024] = ""; + D3DXGetErrorString( hr, szError, sizeof(szError) ); + return szError; +} + + // // Globals // @@ -290,11 +298,13 @@ RageDisplay_D3D::RageDisplay_D3D( VideoModeParams p ) g_pd3d = NULL; } +#if !defined(_XBOX) if( g_D3D8_Module ) { FreeLibrary( g_D3D8_Module ); g_D3D8_Module = NULL; } +#endif throw; } } @@ -472,7 +482,7 @@ bool RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut ) if( FAILED(hr) ) { SDL_QuitSubSystem(SDL_INIT_VIDEO); // exit out of full screen. The ~RageDisplay will not be called! - RageException::Throw( "CreateDevice failed: '%s'", DXGetErrorString8(hr) ); + RageException::Throw( "CreateDevice failed: '%s'", GetErrorString(hr).c_str() ); } } else @@ -482,7 +492,7 @@ bool RageDisplay_D3D::TryVideoMode( VideoModeParams p, bool &bNewDeviceOut ) if( FAILED(hr) ) { SDL_QuitSubSystem(SDL_INIT_VIDEO); // exit out of full screen. The ~RageDisplay will not be called! - RageException::Throw( "g_pd3dDevice->Reset failed: '%s'", DXGetErrorString8(hr) ); + RageException::Throw( "g_pd3dDevice->Reset failed: '%s'", GetErrorString(hr).c_str() ); } } @@ -543,8 +553,10 @@ int RageDisplay_D3D::GetMaxTextureSize() const void RageDisplay_D3D::BeginFrame() { +#ifndef _XBOX if( g_pd3dDevice->TestCooperativeLevel() == D3DERR_DEVICENOTRESET ) SetVideoMode( g_CurrentParams ); +#endif g_pd3dDevice->Clear( 0, NULL, D3DCLEAR_TARGET|D3DCLEAR_ZBUFFER, D3DCOLOR_XRGB(0,0,0), 1.0f, 0x00000000 ); @@ -902,7 +914,7 @@ unsigned RageDisplay_D3D::CreateTexture( hr = g_pd3dDevice->CreateTexture( img->w, img->h, 1, 0, D3DFORMATS[pixfmt], D3DPOOL_MANAGED, &pTex ); if( FAILED(hr) ) RageException::Throw( "CreateTexture(%i,%i,pixfmt=%i) failed: %s", - img->w, img->h, pixfmt, DXGetErrorString8(hr) ); + img->w, img->h, pixfmt, GetErrorString(hr).c_str() ); unsigned uTexHandle = (unsigned)pTex; diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp index 0e69dc3c18..a98e246185 100644 --- a/stepmania/src/RageLog.cpp +++ b/stepmania/src/RageLog.cpp @@ -11,7 +11,7 @@ ----------------------------------------------------------------------------- */ -#include "StepMania.h" +#include "arch/ArchHooks/ArchHooks.h" #include "RageLog.h" #include "RageUtil.h" #include "RageTimer.h" diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp index 83f7d8fb20..7d960b4523 100644 --- a/stepmania/src/RageMath.cpp +++ b/stepmania/src/RageMath.cpp @@ -17,6 +17,7 @@ #include "RageDisplay.h" #include "RageLog.h" #include +#include "arch/ArchHooks/ArchHooks.h" void RageVec2Normalize( RageVector2* pOut, const RageVector2* pV ) { @@ -240,24 +241,20 @@ void RageMatrixCommand( CString sCommandString, RageMatrix &mat ) else if( sName=="rotationz" ) RageMatrixRotationZ( &b, fParam(1) ); else { - CString sError = ssprintf( "Unrecognized matrix command name '%s' in command string '%s'.", sName.c_str(), sCommandString.c_str() ); + CString sError = ssprintf( "MatrixCommand: Unrecognized matrix command name '%s' in command string '%s'.", sName.c_str(), sCommandString.c_str() ); LOG->Warn( sError ); -#if defined(WIN32) && !defined(_XBOX) // XXX arch? - if( DISPLAY->GetVideoModeParams().windowed ) - MessageBox(NULL, sError, "MatrixCommand", MB_OK); -#endif + if( DISPLAY->IsWindowed() ) + HOOKS->MessageBoxOK( sError ); continue; } if( iMaxIndexAccessed != (int)asTokens.size()-1 ) { - CString sError = ssprintf( "Wrong number of parameters in command '%s'. Expected %d but there are %d.", join(",",asTokens).c_str(), iMaxIndexAccessed+1, (int)asTokens.size() ); + CString sError = ssprintf( "MatrixCommand: Wrong number of parameters in command '%s'. Expected %d but there are %d.", join(",",asTokens).c_str(), iMaxIndexAccessed+1, (int)asTokens.size() ); LOG->Warn( sError ); -#if defined(WIN32) // XXX arch? - if( DISPLAY->GetVideoModeParams().windowed ) - MessageBox(NULL, sError, "MatrixCommand", MB_OK); -#endif + if( DISPLAY->IsWindowed() ) + HOOKS->MessageBoxOK( sError ); continue; } diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 8f50533800..37e592ab8a 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -133,8 +133,7 @@ CString vssprintf( const char *fmt, va_list argList) } #ifdef WIN32 -#include "dxerr8.h" -#pragma comment(lib, "DxErr8.lib") +#include "D3DX8Core.h" CString hr_ssprintf( int hr, const char *fmt, ...) { @@ -143,9 +142,10 @@ CString hr_ssprintf( int hr, const char *fmt, ...) CString s = vssprintf( fmt, va ); va_end(va); - /* Why was this commented out? -glenn */ - return s + ssprintf( " (%s)", DXGetErrorString8(hr) ); -// return s;// += ssprintf( " (%s)", DXGetErrorString8(hr) ); + char szError[1024] = ""; + D3DXGetErrorString( hr, szError, sizeof(szError) ); + + return s + ssprintf( " (%s)", szError ); } CString werr_ssprintf( int err, const char *fmt, ...) diff --git a/stepmania/src/RageUtil_CharConversions.cpp b/stepmania/src/RageUtil_CharConversions.cpp index 8d20ca71af..613bf39f5c 100644 --- a/stepmania/src/RageUtil_CharConversions.cpp +++ b/stepmania/src/RageUtil_CharConversions.cpp @@ -4,7 +4,7 @@ #include "RageUtil.h" #include "RageLog.h" -#if defined(WIN32) +#if defined(_WINDOWS) /* Convert from the given codepage to UTF-8. Return true if successful. */ static bool CodePageConvert(CString &txt, int cp) diff --git a/stepmania/src/ScreenEz2SelectMusic.cpp b/stepmania/src/ScreenEz2SelectMusic.cpp index 98644b3210..d0dd593608 100644 --- a/stepmania/src/ScreenEz2SelectMusic.cpp +++ b/stepmania/src/ScreenEz2SelectMusic.cpp @@ -13,8 +13,6 @@ #include "ScreenEz2SelectMusic.h" #include -#include "SDL.h" -#include "SDL_opengl.h" #include "ScreenManager.h" #include "RageSoundManager.h" #include "GameConstantsAndTypes.h" diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp index 428fe1b00d..2fd48710bf 100644 --- a/stepmania/src/ScreenSelect.cpp +++ b/stepmania/src/ScreenSelect.cpp @@ -25,7 +25,7 @@ #include "ThemeManager.h" #include "ModeChoice.h" #include "RageDisplay.h" -#include "StepMania.h" +#include "arch/ArchHooks/ArchHooks.h" #define CHOICES THEME->GetMetric (m_sName,"Choices") diff --git a/stepmania/src/Sprite.cpp b/stepmania/src/Sprite.cpp index 0d88c1453f..07b2a12ee4 100644 --- a/stepmania/src/Sprite.cpp +++ b/stepmania/src/Sprite.cpp @@ -22,7 +22,7 @@ #include "RageDisplay.h" #include "GameConstantsAndTypes.h" #include "SDL_utils.h" -#include "StepMania.h" +#include "arch/ArchHooks/ArchHooks.h" Sprite::Sprite() { diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index ff1ef5b095..73abdd0e4a 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -49,9 +49,8 @@ #include "SongCacheIndex.h" #include "BannerCache.h" #include "UnlockSystem.h" +#include "arch/ArchHooks/ArchHooks.h" -/* This is also a global class; we own it. */ -ArchHooks *HOOKS = NULL; #ifdef WIN32 @@ -200,7 +199,7 @@ static void BoostAppPri() if(!ChangeAppPri()) return; -#ifdef WIN32 +#ifdef _WINDOWS /* We just want a slight boost, so we don't skip needlessly if something happens * in the background. We don't really want to be high-priority--above normal should * be enough. However, ABOVE_NORMAL_PRIORITY_CLASS is only supported in Win2000 @@ -423,7 +422,7 @@ static void RestoreAppPri() if(!ChangeAppPri()) return; -#ifdef WIN32 +#ifdef _WINDOWS SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS); #endif } @@ -517,7 +516,7 @@ int main(int argc, char* argv[]) if ( SDL_GetWMInfo(&info) < 0 ) RageException::Throw( "SDL_GetWMInfo failed" ); -#ifdef WIN32 +#ifdef _WINDOWS g_hWndMain = info.window; #endif diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp index ec3bfb8647..617504d2b7 100644 --- a/stepmania/src/StepMania.dsp +++ b/stepmania/src/StepMania.dsp @@ -21,6 +21,7 @@ CFG=StepMania - Win32 Release !MESSAGE "StepMania - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "StepMania - Xbox Debug" (based on "Xbox Application") !MESSAGE "StepMania - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "StepMania - Xbox Release" (based on "Xbox Application") !MESSAGE # Begin Project @@ -64,7 +65,7 @@ IntDir=.\../Debug6 TargetDir=\stepmania\stepmania 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 ia32.vdi # End Special Build Tool @@ -91,7 +92,7 @@ BSC32=bscmake.exe LINK32=link.exe # ADD BASE LINK32 $(intdir)\verstub.obj kernel32.lib shell32.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe" # SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib -# ADD LINK32 $(intdir)\verstub.obj kernel32.lib shell32.lib user32.lib gdi32.lib advapi32.lib winmm.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe" +# ADD LINK32 $(intdir)\verstub.obj xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe" # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib XBE=imagebld.exe # ADD BASE XBE /nologo /stack:0x10000 /debug @@ -104,7 +105,7 @@ IntDir=.\StepMania___Xbox_Debug___VC6 TargetDir=.\StepMania___Xbox_Debug___VC6 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 ia32.vdi # End Special Build Tool @@ -144,7 +145,47 @@ IntDir=.\../Release6 TargetDir=\stepmania\stepmania 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 ia32.vdi +# End Special Build Tool + +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "StepMania___Xbox_Release" +# PROP BASE Intermediate_Dir "StepMania___Xbox_Release" +# PROP BASE Ignore_Export_Lib 0 +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "StepMania___Xbox_Release" +# PROP Intermediate_Dir "StepMania___Xbox_Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +CPP=cl.exe +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "." /I "SDL-1.2.5\include" /I "SDL_image-1.2" /I "plib-1.6.0" /D "WIN32" /D "_XBOX" /D "_DEBUG" /Fr /YX"global.h" /FD /c +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 $(intdir)\verstub.obj xapilibd.lib d3d8d.lib d3dx8d.lib xgraphicsd.lib dsoundd.lib dmusicd.lib xnetd.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe" +# SUBTRACT BASE LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib +# ADD LINK32 $(intdir)\verstub.obj xapilib.lib d3d8.lib d3dx8.lib xgraphics.lib dsound.lib dmusic.lib xnet.lib xboxkrnl.lib /nologo /pdb:"../debug6/StepMania-debug.pdb" /map /debug /machine:IX86 /nodefaultlib:"libcmtd.lib" /out:"../StepMania-debug.exe" +# SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib +XBE=imagebld.exe +# ADD BASE XBE /nologo /stack:0x10000 /debug +# ADD XBE /nologo /stack:0x10000 /debug +XBCP=xbecopy.exe +# ADD BASE XBCP /NOLOGO +# ADD XBCP /NOLOGO +# Begin Special Build Tool +IntDir=.\StepMania___Xbox_Release +TargetDir=.\StepMania___Xbox_Release +TargetName=StepMania +SOURCE="$(InputPath)" +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 @@ -155,6 +196,7 @@ PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania # Name "StepMania - Win32 Debug" # Name "StepMania - Xbox Debug" # Name "StepMania - Win32 Release" +# Name "StepMania - Xbox Release" # Begin Group "Rage" # PROP Default_Filter "" @@ -174,6 +216,8 @@ SOURCE=.\pcre\get.c !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -191,6 +235,8 @@ SOURCE=.\pcre\maketables.c !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -204,6 +250,8 @@ SOURCE=.\pcre\pcre.c !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -221,6 +269,8 @@ SOURCE=.\pcre\study.c !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -235,6 +285,8 @@ SOURCE=.\regex.c !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -252,6 +304,8 @@ SOURCE=.\SDL_dither.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -269,6 +323,8 @@ SOURCE=.\SDL_rotozoom.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -286,6 +342,8 @@ SOURCE=.\SDL_utils.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -307,6 +365,8 @@ SOURCE=.\RageBitmapTexture.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -324,6 +384,8 @@ SOURCE=.\RageDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -341,6 +403,8 @@ SOURCE=.\RageDisplay_D3D.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -361,6 +425,11 @@ SOURCE=.\RageDisplay_OGL.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -378,6 +447,8 @@ SOURCE=.\RageException.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -395,6 +466,8 @@ SOURCE=.\RageInput.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -412,6 +485,8 @@ SOURCE=.\RageInputDevice.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -429,6 +504,8 @@ SOURCE=.\RageLog.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -446,6 +523,8 @@ SOURCE=.\RageMath.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -463,6 +542,8 @@ SOURCE=.\RageSound.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -480,6 +561,8 @@ SOURCE=.\RageSoundManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -505,6 +588,8 @@ SOURCE=.\RageSoundReader_Preload.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -522,6 +607,8 @@ SOURCE=.\RageSoundReader_Resample.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -539,6 +626,8 @@ SOURCE=.\RageSoundReader_SDL_Sound.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -556,6 +645,8 @@ SOURCE=.\RageSoundResampler.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -573,6 +664,8 @@ SOURCE=.\RageTexture.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -590,6 +683,8 @@ SOURCE=.\RageTextureManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -607,6 +702,8 @@ SOURCE=.\RageThreads.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -624,6 +721,8 @@ SOURCE=.\RageTimer.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -645,6 +744,8 @@ SOURCE=.\RageUtil.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -662,6 +763,8 @@ SOURCE=.\RageUtil_CharConversions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -679,6 +782,8 @@ SOURCE=.\RageUtil_FileDB.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -700,6 +805,8 @@ SOURCE=.\ArrowBackdrop.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -717,6 +824,8 @@ SOURCE=.\BannerCache.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -734,6 +843,8 @@ SOURCE=.\Character.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -751,6 +862,8 @@ SOURCE=.\CodeDetector.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -768,6 +881,8 @@ SOURCE=.\Course.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -785,6 +900,8 @@ SOURCE=.\Font.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -802,6 +919,8 @@ SOURCE=.\FontCharAliases.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -819,6 +938,8 @@ SOURCE=.\FontCharmaps.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -836,6 +957,8 @@ SOURCE=.\GameConstantsAndTypes.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -853,6 +976,8 @@ SOURCE=.\GameDef.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -870,6 +995,8 @@ SOURCE=.\GameInput.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -891,6 +1018,8 @@ SOURCE=.\Grade.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -908,6 +1037,8 @@ SOURCE=.\Inventory.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -925,6 +1056,8 @@ SOURCE=.\LyricsLoader.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -946,6 +1079,8 @@ SOURCE=.\NoteData.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -963,6 +1098,8 @@ SOURCE=.\NoteDataWithScoring.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -980,6 +1117,8 @@ SOURCE=.\NoteFieldPositioning.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -997,6 +1136,8 @@ SOURCE=.\Notes.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1014,6 +1155,8 @@ SOURCE=.\NotesLoader.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1031,6 +1174,8 @@ SOURCE=.\NotesLoaderBMS.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1048,6 +1193,8 @@ SOURCE=.\NotesLoaderDWI.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1065,6 +1212,8 @@ SOURCE=.\NotesLoaderKSF.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1082,6 +1231,8 @@ SOURCE=.\NotesLoaderSM.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1099,6 +1250,8 @@ SOURCE=.\NotesWriterDWI.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1116,6 +1269,8 @@ SOURCE=.\NotesWriterSM.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1133,6 +1288,8 @@ SOURCE=.\NoteTypes.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1150,6 +1307,8 @@ SOURCE=.\PlayerAI.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1167,6 +1326,8 @@ SOURCE=.\PlayerNumber.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1184,6 +1345,8 @@ SOURCE=.\PlayerOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1201,6 +1364,8 @@ SOURCE=.\RandomSample.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1218,6 +1383,8 @@ SOURCE=.\Song.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1235,6 +1402,8 @@ SOURCE=.\SongCacheIndex.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1252,6 +1421,8 @@ SOURCE=.\SongOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1269,6 +1440,8 @@ SOURCE=.\StageStats.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1286,6 +1459,8 @@ SOURCE=.\StyleDef.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1307,6 +1482,8 @@ SOURCE=.\TitleSubstitution.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1328,6 +1505,8 @@ SOURCE=.\IniFile.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1345,6 +1524,8 @@ SOURCE=.\MsdFile.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1374,8 +1555,15 @@ 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" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1391,8 +1579,15 @@ SOURCE=.\arch\LoadingWindow\LoadingWindow_Win32.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1414,6 +1609,8 @@ SOURCE=.\arch\Sound\DSoundHelpers.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1435,6 +1632,8 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1450,8 +1649,15 @@ 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" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1469,6 +1675,8 @@ SOURCE=.\arch\Sound\RageSoundDriver_Null.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1484,8 +1692,15 @@ SOURCE=.\arch\Sound\RageSoundDriver_WaveOut.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1515,6 +1730,8 @@ SOURCE=.\arch\ErrorDialog\ErrorDialog_stdout.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1530,8 +1747,15 @@ SOURCE=.\arch\ErrorDialog\ErrorDialog_Win32.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1545,6 +1769,21 @@ SOURCE=.\arch\ErrorDialog\ErrorDialog_Win32.h # PROP Default_Filter "" # Begin Source File +SOURCE=.\arch\ArchHooks\ArchHooks.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\ArchHooks\ArchHooks.h # End Source File # Begin Source File @@ -1559,8 +1798,15 @@ SOURCE=.\arch\ArchHooks\ArchHooks_Win32.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1584,8 +1830,15 @@ SOURCE=.\arch\InputHandler\InputHandler_DirectInput.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1601,8 +1854,15 @@ SOURCE=.\arch\InputHandler\InputHandler_DirectInputHelper.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1618,8 +1878,15 @@ SOURCE=.\arch\InputHandler\InputHandler_Win32_Pump.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1641,6 +1908,8 @@ SOURCE=.\arch\MovieTexture\MovieTexture.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1656,8 +1925,15 @@ SOURCE=.\arch\MovieTexture\MovieTexture_DShow.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1673,8 +1949,15 @@ SOURCE=.\arch\MovieTexture\MovieTexture_DShowHelper.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1700,6 +1983,8 @@ SOURCE=.\arch\LowLevelWindow\LowLevelWindow_SDL.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1718,6 +2003,8 @@ SOURCE=.\arch\arch.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1733,6 +2020,10 @@ SOURCE=.\arch\arch_default.h SOURCE=.\arch\arch_Win32.h # End Source File +# Begin Source File + +SOURCE=.\arch\arch_xbox.h +# End Source File # End Group # Begin Group "system" @@ -1748,8 +2039,15 @@ SOURCE=.\archutils\Win32\Crash.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1769,8 +2067,15 @@ SOURCE=.\archutils\Win32\Disasm.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1786,8 +2091,15 @@ SOURCE=.\archutils\Win32\Tls.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1804,8 +2116,15 @@ SOURCE=.\archutils\Win32\AppInstance.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1821,8 +2140,15 @@ SOURCE=.\archutils\Win32\DebugInfoHunt.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1838,8 +2164,15 @@ SOURCE=.\archutils\Win32\GotoURL.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1865,6 +2198,8 @@ SOURCE=.\StepMania.RC !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1876,8 +2211,15 @@ SOURCE=.\archutils\Win32\USB.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1893,8 +2235,15 @@ SOURCE=.\archutils\Win32\VideoDriverInfo.cpp !ELSEIF "$(CFG)" == "StepMania - Xbox Debug" +# PROP Exclude_From_Build 1 + !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + +# PROP BASE Exclude_From_Build 1 +# PROP Exclude_From_Build 1 + !ENDIF # End Source File @@ -1916,6 +2265,8 @@ SOURCE=.\global.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1941,6 +2292,8 @@ SOURCE=.\StepMania.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1962,6 +2315,8 @@ SOURCE=.\Actor.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -1983,6 +2338,8 @@ SOURCE=.\ActorFrame.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2000,6 +2357,8 @@ SOURCE=.\ActorScroller.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2017,6 +2376,8 @@ SOURCE=.\ActorUtil.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2034,6 +2395,8 @@ SOURCE=.\BitmapText.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2051,6 +2414,8 @@ SOURCE=.\mathlib.c !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2068,6 +2433,8 @@ SOURCE=.\Model.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2085,6 +2452,8 @@ SOURCE=.\ModelTypes.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2106,6 +2475,8 @@ SOURCE=.\Sprite.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2127,6 +2498,8 @@ SOURCE=.\Banner.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2144,6 +2517,8 @@ SOURCE=.\BGAnimation.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2161,6 +2536,8 @@ SOURCE=.\BGAnimationLayer.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2178,6 +2555,8 @@ SOURCE=.\DifficultyIcon.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2195,6 +2574,8 @@ SOURCE=.\FadingBanner.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2212,6 +2593,8 @@ SOURCE=.\MeterDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2229,6 +2612,8 @@ SOURCE=.\Transition.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2250,6 +2635,8 @@ SOURCE=.\ActiveItemList.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2267,6 +2654,8 @@ SOURCE=.\ArrowEffects.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2284,6 +2673,8 @@ SOURCE=.\Background.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2301,6 +2692,8 @@ SOURCE=.\CombinedLifeMeterEnemy.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2318,6 +2711,8 @@ SOURCE=.\CombinedLifeMeterTug.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2335,6 +2730,8 @@ SOURCE=.\Combo.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2352,6 +2749,8 @@ SOURCE=.\DancingCharacters.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2369,6 +2768,8 @@ SOURCE=.\GhostArrow.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2386,6 +2787,8 @@ SOURCE=.\GhostArrowBright.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2403,6 +2806,8 @@ SOURCE=.\GhostArrowRow.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2420,6 +2825,8 @@ SOURCE=.\GrayArrow.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2437,6 +2844,8 @@ SOURCE=.\GrayArrowRow.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2454,6 +2863,8 @@ SOURCE=.\HoldGhostArrow.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2471,6 +2882,8 @@ SOURCE=.\HoldJudgment.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2488,6 +2901,8 @@ SOURCE=.\Judgment.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2509,6 +2924,8 @@ SOURCE=.\LifeMeterBar.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2526,6 +2943,8 @@ SOURCE=.\LifeMeterBattery.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2543,6 +2962,8 @@ SOURCE=.\LyricDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2560,6 +2981,8 @@ SOURCE=.\NoteDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2577,6 +3000,8 @@ SOURCE=.\NoteField.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2594,6 +3019,8 @@ SOURCE=.\Player.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2611,6 +3038,8 @@ SOURCE=.\ScoreDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2628,6 +3057,8 @@ SOURCE=.\ScoreDisplayBattle.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2645,6 +3076,8 @@ SOURCE=.\ScoreDisplayNormal.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2662,6 +3095,8 @@ SOURCE=.\ScoreDisplayOni.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2679,6 +3114,8 @@ SOURCE=.\ScoreDisplayRave.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2700,6 +3137,8 @@ SOURCE=.\ScoreKeeperMAX2.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2717,6 +3156,8 @@ SOURCE=.\ScoreKeeperRave.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2734,6 +3175,8 @@ SOURCE=.\TimingAssist.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2755,6 +3198,8 @@ SOURCE=.\BPMDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2772,6 +3217,8 @@ SOURCE=.\CourseContentsList.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2789,6 +3236,8 @@ SOURCE=.\CourseEntryDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2806,6 +3255,8 @@ SOURCE=.\DifficultyDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2823,6 +3274,8 @@ SOURCE=.\DifficultyMeter.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2840,6 +3293,8 @@ SOURCE=.\DifficultyRating.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2857,6 +3312,8 @@ SOURCE=.\EditMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2874,6 +3331,8 @@ SOURCE=.\GradeDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2891,6 +3350,8 @@ SOURCE=.\GrooveGraph.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2908,6 +3369,8 @@ SOURCE=.\GrooveRadar.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2925,6 +3388,8 @@ SOURCE=.\GroupList.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2942,6 +3407,8 @@ SOURCE=.\HelpDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2959,6 +3426,8 @@ SOURCE=.\JukeboxMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2976,6 +3445,8 @@ SOURCE=.\MenuElements.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -2993,6 +3464,8 @@ SOURCE=.\MenuTimer.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3010,6 +3483,8 @@ SOURCE=.\ModeSwitcher.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3027,6 +3502,8 @@ SOURCE=.\MusicBannerWheel.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3044,6 +3521,8 @@ SOURCE=.\MusicList.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3061,6 +3540,8 @@ SOURCE=.\MusicSortDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3078,6 +3559,8 @@ SOURCE=.\MusicWheel.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3095,6 +3578,8 @@ SOURCE=.\MusicWheelItem.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3112,6 +3597,8 @@ SOURCE=.\OptionIcon.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3129,6 +3616,8 @@ SOURCE=.\OptionIconRow.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3146,6 +3635,8 @@ SOURCE=.\OptionsCursor.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3163,6 +3654,8 @@ SOURCE=.\ScrollBar.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3180,6 +3673,8 @@ SOURCE=.\ScrollingList.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3197,6 +3692,8 @@ SOURCE=.\SnapDisplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3214,6 +3711,8 @@ SOURCE=.\TextBanner.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3231,6 +3730,8 @@ SOURCE=.\WheelNotifyIcon.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3252,6 +3753,8 @@ SOURCE=.\Screen.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3269,6 +3772,8 @@ SOURCE=.\ScreenAlbums.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3286,6 +3791,8 @@ SOURCE=.\ScreenAppearanceOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3303,6 +3810,8 @@ SOURCE=.\ScreenAttract.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3320,6 +3829,8 @@ SOURCE=.\ScreenAutogenOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3337,6 +3848,8 @@ SOURCE=.\ScreenBackgroundOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3354,6 +3867,8 @@ SOURCE=.\ScreenCaution.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3375,6 +3890,8 @@ SOURCE=.\ScreenCredits.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3392,6 +3909,8 @@ SOURCE=.\ScreenDemonstration.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3409,6 +3928,8 @@ SOURCE=.\ScreenEdit.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3429,6 +3950,8 @@ SOURCE=.\ScreenEditMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3446,6 +3969,8 @@ SOURCE=.\ScreenEvaluation.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3463,6 +3988,8 @@ SOURCE=.\ScreenEz2SelectMusic.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3480,6 +4007,8 @@ SOURCE=.\ScreenEz2SelectPlayer.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3497,6 +4026,8 @@ SOURCE=.\ScreenGameOver.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3514,6 +4045,8 @@ SOURCE=.\ScreenGameplay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3531,6 +4064,8 @@ SOURCE=.\ScreenGameplayOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3548,6 +4083,8 @@ SOURCE=.\ScreenGraphicOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3565,6 +4102,8 @@ SOURCE=.\ScreenHowToPlay.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3582,6 +4121,8 @@ SOURCE=.\ScreenInputOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3599,6 +4140,8 @@ SOURCE=.\ScreenInstructions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3616,6 +4159,8 @@ SOURCE=.\ScreenIntroMovie.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3633,6 +4178,8 @@ SOURCE=.\ScreenJukebox.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3650,6 +4197,8 @@ SOURCE=.\ScreenJukeboxMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3667,6 +4216,8 @@ SOURCE=.\ScreenLogo.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3684,6 +4235,8 @@ SOURCE=.\ScreenMachineOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3701,6 +4254,8 @@ SOURCE=.\ScreenMapControllers.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3726,6 +4281,8 @@ SOURCE=.\ScreenMiniMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3743,6 +4300,8 @@ SOURCE=.\ScreenMusicScroll.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3760,6 +4319,8 @@ SOURCE=.\ScreenNameEntry.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3777,6 +4338,8 @@ SOURCE=.\ScreenOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3794,6 +4357,8 @@ SOURCE=.\ScreenOptionsMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3811,6 +4376,8 @@ SOURCE=.\ScreenPlayerOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3828,6 +4395,8 @@ SOURCE=.\ScreenPrompt.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3845,6 +4414,8 @@ SOURCE=.\ScreenRanking.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3862,6 +4433,8 @@ SOURCE=.\ScreenRaveOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3879,6 +4452,8 @@ SOURCE=.\ScreenSandbox.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3896,6 +4471,8 @@ SOURCE=.\ScreenSelect.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3913,6 +4490,8 @@ SOURCE=.\ScreenSelectCharacter.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3930,6 +4509,8 @@ SOURCE=.\ScreenSelectCourse.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3947,6 +4528,8 @@ SOURCE=.\ScreenSelectDifficulty.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3964,6 +4547,8 @@ SOURCE=.\ScreenSelectDifficultyEX.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3981,6 +4566,8 @@ SOURCE=.\ScreenSelectGame.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -3998,6 +4585,8 @@ SOURCE=.\ScreenSelectGroup.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4015,6 +4604,8 @@ SOURCE=.\ScreenSelectMaster.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4032,6 +4623,8 @@ SOURCE=.\ScreenSelectMode.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4049,6 +4642,8 @@ SOURCE=.\ScreenSelectMusic.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4066,6 +4661,8 @@ SOURCE=.\ScreenSelectStyle.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4083,6 +4680,8 @@ SOURCE=.\ScreenSelectStyle5th.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4100,6 +4699,8 @@ SOURCE=.\ScreenSongOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4117,6 +4718,8 @@ SOURCE=.\ScreenSoundOptions.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4134,6 +4737,8 @@ SOURCE=.\ScreenStage.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4151,6 +4756,8 @@ SOURCE=.\ScreenStyleSplash.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4168,6 +4775,8 @@ SOURCE=.\ScreenTest.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4185,6 +4794,8 @@ SOURCE=.\ScreenTestFonts.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4202,6 +4813,8 @@ SOURCE=.\ScreenTestSound.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4219,6 +4832,8 @@ SOURCE=.\ScreenTextEntry.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4236,6 +4851,8 @@ SOURCE=.\ScreenTitleMenu.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4253,6 +4870,8 @@ SOURCE=.\ScreenUnlock.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4282,6 +4901,8 @@ SOURCE=.\AnnouncerManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4299,6 +4920,8 @@ SOURCE=.\FontManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4316,6 +4939,8 @@ SOURCE=.\GameManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4333,6 +4958,8 @@ SOURCE=.\GameState.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4350,6 +4977,8 @@ SOURCE=.\InputFilter.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4367,6 +4996,8 @@ SOURCE=.\InputMapper.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4384,6 +5015,8 @@ SOURCE=.\InputQueue.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4401,6 +5034,8 @@ SOURCE=.\NoteSkinManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4418,6 +5053,8 @@ SOURCE=.\PrefsManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4435,6 +5072,8 @@ SOURCE=.\ScreenManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4452,6 +5091,8 @@ SOURCE=.\SongManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4469,6 +5110,8 @@ SOURCE=.\ThemeManager.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File @@ -4486,6 +5129,8 @@ SOURCE=.\UnlockSystem.cpp !ELSEIF "$(CFG)" == "StepMania - Win32 Release" +!ELSEIF "$(CFG)" == "StepMania - Xbox Release" + !ENDIF # End Source File diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h index d514b86256..249d1358af 100644 --- a/stepmania/src/StepMania.h +++ b/stepmania/src/StepMania.h @@ -15,9 +15,6 @@ void ApplyGraphicOptions(); void ExitGame(); void ResetGame(); -#include "arch/ArchHooks/ArchHooks.h" -extern ArchHooks *HOOKS; // global and accessable from anywhere in our program - #if defined(WIN32) extern HWND g_hWndMain; #endif diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 7d14c312c5..673d8faad8 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -22,6 +22,7 @@ #include "Font.h" #include "FontCharAliases.h" #include "RageDisplay.h" +#include "arch/ArchHooks/ArchHooks.h" ThemeManager* THEME = NULL; // global object accessable from anywhere in the program @@ -157,15 +158,14 @@ try_element_again: FlushDirCache(); CString message = ssprintf( - "There is more than one theme element element that matches " + "ThemeManager: There is more than one theme element element that matches " "'%s/%s/%s'. Please remove all but one of these matches.", sThemeName.c_str(), sCategory.c_str(), sFileName.c_str() ); -#if defined(WIN32) // XXX arch? if( DISPLAY->IsWindowed() ) - if( MessageBox(NULL, message, "ThemeManager", MB_RETRYCANCEL ) == IDRETRY) + if( ArchHooks::retry == HOOKS->MessageBoxAbortRetryIgnore(message) ) goto try_element_again; -#endif + RageException::Throw( message ); } else if( asElementPaths.size() == 0 ) @@ -206,15 +206,14 @@ try_element_again: else { CString message = ssprintf( - "The redirect '%s' points to the file '%s', which does not exist. " + "ThemeManager: The redirect '%s' points to the file '%s', which does not exist. " "Verify that this redirect is correct.", sPath.c_str(), sNewFileName.c_str()); -#if defined(WIN32) // XXX arch? if( DISPLAY->IsWindowed() ) - if( MessageBox(NULL, message, "ThemeManager", MB_RETRYCANCEL ) == IDRETRY) + if( ArchHooks::retry == HOOKS->MessageBoxAbortRetryIgnore(message) ) goto try_element_again; -#endif + RageException::Throw( "%s", message.c_str() ); } } diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.cpp b/stepmania/src/arch/ArchHooks/ArchHooks.cpp new file mode 100644 index 0000000000..c24bc59aea --- /dev/null +++ b/stepmania/src/arch/ArchHooks/ArchHooks.cpp @@ -0,0 +1,4 @@ +#include "global.h" +#include "ArchHooks.h" + +ArchHooks *HOOKS = NULL; diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h index 17e76c0e36..24573c829f 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks.h +++ b/stepmania/src/arch/ArchHooks/ArchHooks.h @@ -40,6 +40,8 @@ public: #endif +extern ArchHooks *HOOKS; // global and accessable from anywhere in our program + /* * Copyright (c) 2002-2003 by the person(s) listed below. All rights reserved. * diff --git a/stepmania/src/arch/MovieTexture/MovieTexture.cpp b/stepmania/src/arch/MovieTexture/MovieTexture.cpp index 6c1122be21..00d935da6f 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture.cpp @@ -3,7 +3,7 @@ #include "RageUtil.h" #include "RageLog.h" -#if defined(WIN32) +#if defined(_WINDOWS) #include "MovieTexture_DShow.h" #endif @@ -64,7 +64,7 @@ RageMovieTexture *MakeRageMovieTexture(RageTextureID ID) { DumpAVIDebugInfo( ID.filename ); -#if defined(WIN32) +#if defined(_WINDOWS) return new MovieTexture_DShow(ID); #else /* XXX: need a simple null movie texture object */ diff --git a/stepmania/src/arch/Sound/DSoundHelpers.cpp b/stepmania/src/arch/Sound/DSoundHelpers.cpp index 4f5b172fcc..c95a9c85f8 100644 --- a/stepmania/src/arch/Sound/DSoundHelpers.cpp +++ b/stepmania/src/arch/Sound/DSoundHelpers.cpp @@ -4,7 +4,6 @@ #include "../../RageLog.h" #define DIRECTSOUND_VERSION 0x0700 -#include #include #include @@ -26,28 +25,35 @@ DSound::DSound() { HRESULT hr; +#ifndef _XBOX // Initialize COM if( FAILED( hr = CoInitialize( NULL ) ) ) RageException::ThrowNonfatal(hr_ssprintf(hr, "CoInitialize")); +#endif // Create IDirectSound using the primary sound device if( FAILED( hr = DirectSoundCreate( NULL, &ds, NULL ) ) ) RageException::ThrowNonfatal(hr_ssprintf(hr, "DirectSoundCreate")); +#ifndef _XBOX DirectSoundEnumerate(EnumCallback, 0); /* Try to set primary mixing privileges */ hr = ds->SetCooperativeLevel(GetDesktopWindow(), DSSCL_PRIORITY); +#endif } DSound::~DSound() { ds->Release(); +#ifndef _XBOX CoUninitialize(); +#endif } bool DSound::IsEmulated() const { +#ifndef _XBOX /* Don't bother wasting time trying to create buffers if we're * emulated. This also gives us better diagnostic information. */ DSCAPS Caps; @@ -61,6 +67,9 @@ bool DSound::IsEmulated() const } return !!(Caps.dwFlags & DSCAPS_EMULDRIVER); +#else + return false; +#endif } DSoundBuf::DSoundBuf(DSound &ds, DSoundBuf::hw hardware, @@ -100,30 +109,44 @@ DSoundBuf::DSoundBuf(DSound &ds, DSoundBuf::hw hardware, DSBUFFERDESC format; memset(&format, 0, sizeof(format)); format.dwSize = sizeof(format); +#ifdef _XBOX + format.dwFlags = DSBCAPS_CTRLVOLUME; +#else format.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS | DSBCAPS_CTRLVOLUME; - +#endif + +#ifndef _XBOX /* Don't use DSBCAPS_STATIC. It's meant for static buffers, and we * only use streaming buffers. */ if(hardware == HW_HARDWARE) format.dwFlags |= DSBCAPS_LOCHARDWARE; else format.dwFlags |= DSBCAPS_LOCSOFTWARE; +#endif if(NeedCtrlFrequency) format.dwFlags |= DSBCAPS_CTRLFREQUENCY; format.dwBufferBytes = buffersize; +#ifndef _XBOX format.dwReserved = 0; +#endif format.lpwfxFormat = &waveformat; - IDirectSoundBuffer *sndbuf_buf; - HRESULT hr = ds.GetDS()->CreateSoundBuffer(&format, &sndbuf_buf, NULL); + /* Query IID_IDirectSoundBuffer instead of IID_IDirectSoundBuffer8. -Chris */ +// IDirectSoundBuffer *sndbuf_buf; +// HRESULT hr = ds.GetDS()->CreateSoundBuffer(&format, &sndbuf_buf, NULL); +// if (FAILED(hr)) +// RageException::ThrowNonfatal(hr_ssprintf(hr, "CreateSoundBuffer failed")); +// +// sndbuf_buf->QueryInterface(IID_IDirectSoundBuffer8, (LPVOID*) &buf); +// ASSERT(buf); + + HRESULT hr = ds.GetDS()->CreateSoundBuffer(&format, &buf, NULL); if (FAILED(hr)) RageException::ThrowNonfatal(hr_ssprintf(hr, "CreateSoundBuffer failed")); - sndbuf_buf->QueryInterface(IID_IDirectSoundBuffer, (LPVOID*) &buf); - ASSERT(buf); - +#ifndef _XBOX /* I'm not sure this should ever be needed, but ... */ DSBCAPS bcaps; bcaps.dwSize=sizeof(bcaps); @@ -137,6 +160,7 @@ DSoundBuf::DSoundBuf(DSound &ds, DSoundBuf::hw hardware, buffersize = bcaps.dwBufferBytes; writeahead = min(writeahead, buffersize); } +#endif } void DSoundBuf::SetSampleRate(int hz) @@ -187,6 +211,7 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int *play_pos, i /* It's easiest to think of the cursor as a block, starting and ending at * the two values returned by GetCurrentPosition, that we can't write to. */ result = buf->GetCurrentPosition(&cursorstart, &cursorend); +#ifndef _XBOX if ( result == DSERR_BUFFERLOST ) { buf->Restore(); result = buf->GetCurrentPosition(&cursorstart, &cursorend); @@ -195,6 +220,7 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int *play_pos, i LOG->Warn(hr_ssprintf(result, "DirectSound::GetCurrentPosition failed")); return false; } +#endif /* XXX We can figure out if we've underrun, and increase the write-ahead @@ -271,10 +297,12 @@ bool DSoundBuf::get_output_buf(char **buffer, unsigned *bufsiz, int *play_pos, i /* Lock the audio buffer. */ result = buf->Lock(write_cursor, num_bytes_empty, (LPVOID *)buffer, (DWORD *) bufsiz, NULL, &junk, 0); +#ifndef _XBOX if ( result == DSERR_BUFFERLOST ) { buf->Restore(); result = buf->Lock(write_cursor, num_bytes_empty, (LPVOID *)buffer, (DWORD *) bufsiz, NULL, &junk, 0); } +#endif if ( result != DS_OK ) { LOG->Warn(hr_ssprintf(result, "Couldn't lock the DirectSound buffer.")); return false; diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp index 27b894ea3c..35369ced48 100644 --- a/stepmania/src/arch/arch.cpp +++ b/stepmania/src/arch/arch.cpp @@ -17,7 +17,9 @@ #include "arch_linux.h" #elif defined(DARWIN) #include "arch_darwin.h" -#elif defined(WIN32) +#elif defined(_XBOX) +#include "arch_xbox.h" +#elif defined(_WINDOWS) #include "arch_Win32.h" #endif @@ -28,13 +30,13 @@ LowLevelWindow *MakeLowLevelWindow() { return new ARCH_LOW_LEVEL_WINDOW; } void MakeInputHandlers(vector &Add) { -#if defined(WIN32) && !defined(_XBOX) +#if defined(_WINDOWS) Add.push_back(new InputHandler_DInput); #else Add.push_back(new InputHandler_SDL); #endif -#if defined(WIN32) +#if defined(_WINDOWS) Add.push_back(new InputHandler_Win32_Pump); // Add.push_back(new InputHandler_Win32_Para); #endif @@ -62,11 +64,14 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers) Driver = DriversToTry[i]; LOG->Trace("Initializing driver: %s", DriversToTry[i].c_str()); -#ifdef WIN32 +#ifdef WINDOWS if(!DriversToTry[i].CompareNoCase("DirectSound")) ret = new RageSound_DSound; if(!DriversToTry[i].CompareNoCase("DirectSound-sw")) ret = new RageSound_DSound_Software; if(!DriversToTry[i].CompareNoCase("WaveOut")) ret = new RageSound_WaveOut; #endif +#ifdef _XBOX + if(!DriversToTry[i].CompareNoCase("DirectSound")) ret = new RageSound_DSound; +#endif #ifdef HAVE_ALSA if(!DriversToTry[i].CompareNoCase("ALSA9")) ret = new RageSound_ALSA9; #endif diff --git a/stepmania/src/arch/arch_xbox.h b/stepmania/src/arch/arch_xbox.h new file mode 100644 index 0000000000..decbed1967 --- /dev/null +++ b/stepmania/src/arch/arch_xbox.h @@ -0,0 +1,20 @@ +#ifndef XBOX_ARCH_H +#define XBOX_ARCH_H + +/* Load drivers for Win32. */ +#include "LoadingWindow/LoadingWindow_SDL.h" +#include "ErrorDialog/ErrorDialog_null.h" +#include "ArchHooks/ArchHooks_none.h" + +#include "InputHandler/InputHandler_DirectInput.h" + +#include "Sound/RageSoundDriver_DSound.h" + +#endif + +/* + * Copyright (c) 2002 by the person(s) listed below. All rights reserved. + * + * Glenn Maynard + * Chris Danford + */