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

fixed some xbox build errors :/

Browse Source
This commit is contained in:
Manu Evans
2004-01-17 05:21:24 +00:00
parent 8bf9b74421
commit ce888de237
11 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverDirect.cpp
+2
View File
@@ -14,7 +14,9 @@
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#else #else
#if !defined(_XBOX)
#include <windows.h> #include <windows.h>
#endif
#include <io.h> #include <io.h>
#endif #endif
stepmania/src/RageFileDriverDirectHelpers.cpp
+2
View File
@@ -11,7 +11,9 @@
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#else #else
#if !defined(_XBOX)
#include <windows.h> #include <windows.h>
#endif
#include <io.h> #include <io.h>
#endif #endif
stepmania/src/RageFileDriverZip.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ freely, subject to the following restrictions:
#include <errno.h> #include <errno.h>
#if defined(_WINDOWS) #if defined(_WINDOWS) || defined(_XBOX)
#include "zlib/zlib.h" #include "zlib/zlib.h"
#pragma comment(lib, "zlib/zdll.lib") #pragma comment(lib, "zlib/zdll.lib")
#else #else
stepmania/src/RageLog.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "RageThreads.h" #include "RageThreads.h"
#include <time.h> #include <time.h>
#include "ProductInfo.h" #include "ProductInfo.h"
#if defined(WIN32) && !defined(_XBOX) #if defined(_WINDOWS)
#include "windows.h" #include "windows.h"
#endif #endif
#include <map> #include <map>
stepmania/src/RageSoundReader_Vorbisfile.cpp
+1 -1
View File
@@ -11,7 +11,7 @@
#if defined(INTEGER_OGG) #if defined(INTEGER_OGG)
#include "tremor/ivorbisfile.h" #include "tremor/ivorbisfile.h"
#else #else
#include "vorbis/vorbisfile.h" #include "vorbis/vorbis/vorbisfile.h"
#endif #endif
#if defined(_XBOX) #if defined(_XBOX)
stepmania/src/RageUtil.cpp
+1 -1
View File
@@ -146,10 +146,10 @@ CString vssprintf( const char *fmt, va_list argList)
} }
#ifdef WIN32 #ifdef WIN32
#include "windows.h"
#ifdef _XBOX #ifdef _XBOX
#include "D3DX8Core.h" #include "D3DX8Core.h"
#else #else
#include "windows.h"
#include "Dxerr8.h" #include "Dxerr8.h"
#pragma comment(lib, "Dxerr8.lib") #pragma comment(lib, "Dxerr8.lib")
#endif #endif
stepmania/src/StepMania.dsp
+18 -18
View File
@@ -62,10 +62,10 @@ LINK32=link.exe
# SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib # SUBTRACT LINK32 /verbose /profile /pdb:none /incremental:no /nodefaultlib
# Begin Special Build Tool # Begin Special Build Tool
IntDir=.\../Debug6 IntDir=.\../Debug6
TargetDir=\stepmania\stepmania\Program TargetDir=\CVS\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
@@ -99,11 +99,11 @@ XBCP=xbecopy.exe
# ADD XBCP /NOLOGO # ADD XBCP /NOLOGO
# Begin Special Build Tool # Begin Special Build Tool
IntDir=.\Debug IntDir=.\Debug
TargetDir=\stepmania\stepmania TargetDir=\CVS\stepmania
TargetName=default TargetName=default
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c \
verstub.cpp /Fo$(IntDir)\ verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool # End Special Build Tool
@@ -140,10 +140,10 @@ LINK32=link.exe
# SUBTRACT LINK32 /verbose /pdb:none # SUBTRACT LINK32 /verbose /pdb:none
# Begin Special Build Tool # Begin Special Build Tool
IntDir=.\../Release6 IntDir=.\../Release6
TargetDir=\stepmania\itg\Program TargetDir=\CVS\itg\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
@@ -181,11 +181,11 @@ XBCP=xbecopy.exe
# ADD XBCP /NOLOGO # ADD XBCP /NOLOGO
# Begin Special Build Tool # Begin Special Build Tool
IntDir=.\StepMania___Xbox_Release IntDir=.\StepMania___Xbox_Release
TargetDir=\stepmania\stepmania TargetDir=\CVS\stepmania
TargetName=default TargetName=default
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PreLink_Cmds=disasm\verinc cl /Zl /nologo /c \ PreLink_Cmds=disasm\verinc cl /Zl /nologo /c \
verstub.cpp /Fo$(IntDir)\ verstub.cpp /Fo$(IntDir)\
PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
# End Special Build Tool # End Special Build Tool
@@ -1897,8 +1897,6 @@ SOURCE=.\arch\LoadingWindow\LoadingWindow_SDL.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -1949,8 +1947,6 @@ SOURCE=.\arch\Sound\DSoundHelpers.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -1974,8 +1970,6 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -1995,8 +1989,6 @@ SOURCE=.\arch\Sound\RageSoundDriver_DSound_Software.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -2205,6 +2197,8 @@ SOURCE=.\arch\InputHandler\InputHandler_Win32_Para.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -2447,6 +2441,8 @@ SOURCE=.\arch\Lights\LightsDriver_Win32Parallel.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -2478,6 +2474,8 @@ SOURCE=.\arch\MemoryCard\MemoryCardDriver_Windows.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
@@ -2633,6 +2631,8 @@ SOURCE=.\archutils\Win32\RestartProgram.cpp
!ELSEIF "$(CFG)" == "StepMania - Xbox Debug" !ELSEIF "$(CFG)" == "StepMania - Xbox Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "StepMania - Win32 Release" !ELSEIF "$(CFG)" == "StepMania - Win32 Release"
!ELSEIF "$(CFG)" == "StepMania - Xbox Release" !ELSEIF "$(CFG)" == "StepMania - Xbox Release"
stepmania/src/StepMania.h
+1 -1
View File
@@ -21,7 +21,7 @@ void ReadGamePrefsFromDisk( bool bSwitchToLastPlayedGame=true );
void SaveGamePrefsToDisk(); void SaveGamePrefsToDisk();
void ChangeCurrentGame( Game g ); void ChangeCurrentGame( Game g );
#if defined(WIN32) #if defined(_WINDOWS)
#include "windows.h" #include "windows.h"
extern HWND g_hWndMain; extern HWND g_hWndMain;
#endif #endif
stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp
+1
View File
@@ -2,6 +2,7 @@
#include "SDL_utils.h" #include "SDL_utils.h"
#include "SDL_image.h" #include "SDL_image.h"
#include "SDL_video.h"
#include "SDL_rotozoom.h" #include "SDL_rotozoom.h"
#include "LoadingWindow_SDL.h" #include "LoadingWindow_SDL.h"
#include "loading.xpm" #include "loading.xpm"
stepmania/src/arch/Sound/DSoundHelpers.cpp
+2
View File
@@ -3,7 +3,9 @@
#include "../../RageUtil.h" #include "../../RageUtil.h"
#include "../../RageLog.h" #include "../../RageLog.h"
#if defined(_WINDOWS)
#include <mmsystem.h> #include <mmsystem.h>
#endif
#define DIRECTSOUND_VERSION 0x0700 #define DIRECTSOUND_VERSION 0x0700
#include <dsound.h> #include <dsound.h>
stepmania/src/arch/Sound/DSoundHelpers.h
+2
View File
@@ -2,8 +2,10 @@
#define DSOUND_HELPERS 1 #define DSOUND_HELPERS 1
#include "SDL.h" #include "SDL.h"
#if defined(_WINDOWS)
#include "windows.h" #include "windows.h"
#include "wtypes.h" #include "wtypes.h"
#endif
struct IDirectSound; struct IDirectSound;
struct IDirectSoundBuffer; struct IDirectSoundBuffer;