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

fixing Xbox compile errors

Browse Source
This commit is contained in:
Chris Danford
2004-06-15 06:24:58 +00:00
parent ec8b899889
commit b2cf196d74
8 changed files with 30 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay_D3D.cpp
+3 -1
View File
@@ -683,7 +683,9 @@ bool RageDisplay_D3D::SupportsTextureFormat( PixelFormat pixfmt, bool realtime )
RageSurface* RageDisplay_D3D::CreateScreenshot()
{
#ifndef _XBOX
#if defined(_XBOX)
return NULL;
#elif
/* Get the back buffer. */
IDirect3DSurface8* pSurface;
g_pd3dDevice->GetBackBuffer( 0, D3DBACKBUFFER_TYPE_MONO, &pSurface );
stepmania/src/RageSoundManager.h
+1 -1
View File
@@ -11,7 +11,7 @@ class RageSoundDriver;
struct RageSoundParams;
/* This is a temporary hack, to try to track down an obscure crash. */
#if defined(_MSC_VER) && _MSC_VER >= 1300
#if defined(_WINDOWS) && _MSC_VER >= 1300
#include <windows.h>
extern set<void *> g_ProtectedPages;
stepmania/src/RageSurface_Load_JPEG.cpp
+5
View File
@@ -8,6 +8,11 @@
#include <setjmp.h>
// Don't let jpeglib.h define the boolean type on Xbox.
#if defined(_XBOX)
# define HAVE_BOOLEAN
#endif
#if defined(WIN32)
/* work around namespace bugs in win32/libjpeg: */
#define XMD_H
stepmania/src/RageThreads.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
#include "arch/Threads/Threads.h"
#if defined(CRASH_HANDLER)
#if defined(WIN32)
#if defined(_WINDOWS)
#include "archutils/Win32/crash.h"
#elif defined(LINUX) || defined(DARWIN)
#include "archutils/Unix/CrashHandler.h"
stepmania/src/StepManiaXbox.sln
+2 -8
View File
@@ -3,18 +3,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StepMania", "StepManiaXbox.
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
ConfigName.0 = Debug
ConfigName.1 = Release
ConfigName.2 = Debug Xbox
ConfigName.3 = Release Xbox
ConfigName.0 = Debug Xbox
ConfigName.1 = Release Xbox
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug.ActiveCfg = Debug|Win32
{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug.Build.0 = Debug|Win32
{670745A6-106B-420D-A2A9-D4F89A23986E}.Release.ActiveCfg = Release|Win32
{670745A6-106B-420D-A2A9-D4F89A23986E}.Release.Build.0 = Release|Win32
{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug Xbox.ActiveCfg = Debug|Xbox
{670745A6-106B-420D-A2A9-D4F89A23986E}.Debug Xbox.Build.0 = Debug|Xbox
{670745A6-106B-420D-A2A9-D4F89A23986E}.Release Xbox.ActiveCfg = Release|Xbox
stepmania/src/StepManiaXbox.vcproj
+3 -366
View File
@@ -93,7 +93,7 @@ cl /Zl /nologo /c verstub.cpp /Fo&quot;$(IntDir)&quot;\
Name="VCCLCompilerTool"
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories=".;.\sdl_xbox_includes;&quot;.\SDL_image-1.2&quot;;&quot;.\plib-1.6.0&quot;;&quot;.\SDL_sound-1.0.0&quot;;vorbis"
AdditionalIncludeDirectories=".,sdl_xbox_includes,SDL_image-1.2;vorbis,libjpeg,lua-5.0"
PreprocessorDefinitions="WIN32,_XBOX,_DEBUG,OGG_ONLY"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
@@ -1093,18 +1093,6 @@ cl
<File
RelativePath="arch\LoadingWindow\LoadingWindow.h">
</File>
<File
RelativePath="arch\LoadingWindow\LoadingWindow_SDL.cpp">
</File>
<File
RelativePath="arch\LoadingWindow\LoadingWindow_SDL.h">
</File>
<File
RelativePath="arch\LoadingWindow\LoadingWindow_Win32.cpp">
</File>
<File
RelativePath="arch\LoadingWindow\LoadingWindow_Win32.h">
</File>
</Filter>
<Filter
Name="Sound"
@@ -1124,30 +1112,12 @@ cl
<File
RelativePath="arch\Sound\RageSoundDriver_DSound.h">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_DSound_Software.cpp">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_DSound_Software.h">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_Generic_Software.cpp">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_Generic_Software.h">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_Null.cpp">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_Null.h">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_WaveOut.cpp">
</File>
<File
RelativePath="arch\Sound\RageSoundDriver_WaveOut.h">
</File>
</Filter>
<Filter
Name="ArchHooks"
@@ -1175,28 +1145,10 @@ cl
RelativePath="arch\InputHandler\InputHandler.h">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_DirectInput.cpp">
RelativePath="arch\InputHandler\InputHandler_SDL.cpp">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_DirectInput.h">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_DirectInputHelper.cpp">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_DirectInputHelper.h">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_Win32_Para.cpp">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_Win32_Para.h">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_Win32_Pump.cpp">
</File>
<File
RelativePath="arch\InputHandler\InputHandler_Win32_Pump.h">
RelativePath="arch\InputHandler\InputHandler_SDL.h">
</File>
</Filter>
<Filter
@@ -1208,18 +1160,6 @@ cl
<File
RelativePath="arch\MovieTexture\MovieTexture.h">
</File>
<File
RelativePath="arch\MovieTexture\MovieTexture_DShow.cpp">
</File>
<File
RelativePath="arch\MovieTexture\MovieTexture_DShow.h">
</File>
<File
RelativePath="arch\MovieTexture\MovieTexture_DShowHelper.cpp">
</File>
<File
RelativePath="arch\MovieTexture\MovieTexture_DShowHelper.h">
</File>
<File
RelativePath="arch\MovieTexture\MovieTexture_FFMpeg.cpp">
</File>
@@ -1274,18 +1214,6 @@ cl
<File
RelativePath="arch\MemoryCard\MemoryCardDriver.h">
</File>
<File
RelativePath="arch\MemoryCard\MemoryCardDriverThreaded.cpp">
</File>
<File
RelativePath="arch\MemoryCard\MemoryCardDriverThreaded.h">
</File>
<File
RelativePath="arch\MemoryCard\MemoryCardDriverThreaded_Windows.cpp">
</File>
<File
RelativePath="arch\MemoryCard\MemoryCardDriverThreaded_Windows.h">
</File>
<File
RelativePath="arch\MemoryCard\MemoryCardDriver_Null.h">
</File>
@@ -1326,75 +1254,6 @@ cl
<Filter
Name="system"
Filter="">
<File
RelativePath="archutils\Win32\AppInstance.cpp">
</File>
<File
RelativePath="archutils\Win32\AppInstance.h">
</File>
<File
RelativePath="archutils\Win32\Crash.cpp">
</File>
<File
RelativePath="archutils\Win32\Crash.h">
</File>
<File
RelativePath="archutils\Win32\DebugInfoHunt.cpp">
</File>
<File
RelativePath="archutils\Win32\DebugInfoHunt.h">
</File>
<File
RelativePath="archutils\Win32\GetFileInformation.cpp">
</File>
<File
RelativePath="archutils\Win32\GetFileInformation.h">
</File>
<File
RelativePath="archutils\Win32\GotoURL.cpp">
</File>
<File
RelativePath="archutils\Win32\GotoURL.h">
</File>
<File
RelativePath="archutils\Win32\RegistryAccess.cpp">
</File>
<File
RelativePath="archutils\Win32\RegistryAccess.h">
</File>
<File
RelativePath="archutils\Win32\RestartProgram.cpp">
</File>
<File
RelativePath="archutils\Win32\RestartProgram.h">
</File>
<File
RelativePath="archutils\Win32\StepMania.ico">
</File>
<File
RelativePath="archutils\Win32\USB.cpp">
</File>
<File
RelativePath="archutils\Win32\USB.h">
</File>
<File
RelativePath="archutils\Win32\VideoDriverInfo.cpp">
</File>
<File
RelativePath="archutils\Win32\VideoDriverInfo.h">
</File>
<File
RelativePath="archutils\Win32\WindowsResources.h">
</File>
<File
RelativePath="archutils\Win32\WindowsResources.rc">
</File>
<File
RelativePath="archutils\Win32\arch_setup.cpp">
</File>
<File
RelativePath="archutils\Win32\arch_setup.h">
</File>
</Filter>
</Filter>
<Filter
@@ -1910,12 +1769,6 @@ cl
<File
RelativePath="RageDisplay_Null.h">
</File>
<File
RelativePath="RageDisplay_OGL.cpp">
</File>
<File
RelativePath="RageDisplay_OGL.h">
</File>
<File
RelativePath="RageException.cpp">
</File>
@@ -2434,225 +2287,9 @@ cl
<Filter
Name="Crypto"
Filter="">
<File
RelativePath="crypto\CryptBn.cpp">
</File>
<File
RelativePath="crypto\CryptBn.h">
</File>
<File
RelativePath="CryptHelpers.cpp">
</File>
<File
RelativePath="CryptHelpers.h">
</File>
<File
RelativePath="crypto\CryptMD5.cpp">
</File>
<File
RelativePath="crypto\CryptMD5.h">
</File>
<File
RelativePath="crypto\CryptNoise.cpp">
</File>
<File
RelativePath="crypto\CryptPrime.cpp">
</File>
<File
RelativePath="crypto\CryptPrime.h">
</File>
<File
RelativePath="crypto\CryptRSA.cpp">
</File>
<File
RelativePath="crypto\CryptRSA.h">
</File>
<File
RelativePath="crypto\CryptRand.cpp">
</File>
<File
RelativePath="crypto\CryptRand.h">
</File>
<File
RelativePath="crypto\CryptSH512.cpp">
</File>
<File
RelativePath="crypto\CryptSH512.h">
</File>
<File
RelativePath="crypto\CryptSHA.cpp">
</File>
<File
RelativePath="crypto\CryptSHA.h">
</File>
<Filter
Name="crypto++"
Filter="">
<File
RelativePath="crypto51\algebra.cpp">
</File>
<File
RelativePath="crypto51\algebra.h">
</File>
<File
RelativePath="crypto51\algparam.cpp">
</File>
<File
RelativePath="crypto51\algparam.h">
</File>
<File
RelativePath="crypto51\argnames.h">
</File>
<File
RelativePath="crypto51\asn.cpp">
</File>
<File
RelativePath="crypto51\asn.h">
</File>
<File
RelativePath="crypto51\config.h">
</File>
<File
RelativePath="crypto51\cryptlib.cpp">
</File>
<File
RelativePath="crypto51\cryptlib.h">
</File>
<File
RelativePath="crypto51\files.cpp">
</File>
<File
RelativePath="crypto51\files.h">
</File>
<File
RelativePath="crypto51\filters.cpp">
</File>
<File
RelativePath="crypto51\filters.h">
</File>
<File
RelativePath="crypto51\fltrimpl.h">
</File>
<File
RelativePath="crypto51\integer.cpp">
</File>
<File
RelativePath="crypto51\integer.h">
</File>
<File
RelativePath="crypto51\iterhash.cpp">
</File>
<File
RelativePath="crypto51\iterhash.h">
</File>
<File
RelativePath="crypto51\mdc.h">
</File>
<File
RelativePath="crypto51\misc.cpp">
</File>
<File
RelativePath="crypto51\misc.h">
</File>
<File
RelativePath="crypto51\modarith.h">
</File>
<File
RelativePath="crypto51\modes.cpp">
</File>
<File
RelativePath="crypto51\modes.h">
</File>
<File
RelativePath="crypto51\mqueue.cpp">
</File>
<File
RelativePath="crypto51\mqueue.h">
</File>
<File
RelativePath="crypto51\nbtheory.cpp">
</File>
<File
RelativePath="crypto51\nbtheory.h">
</File>
<File
RelativePath="crypto51\oaep.cpp">
</File>
<File
RelativePath="crypto51\oaep.h">
</File>
<File
RelativePath="crypto51\oids.h">
</File>
<File
RelativePath="crypto51\osrng.cpp">
</File>
<File
RelativePath="crypto51\osrng.h">
</File>
<File
RelativePath="crypto51\pch.h">
</File>
<File
RelativePath="crypto51\pkcspad.cpp">
</File>
<File
RelativePath="crypto51\pkcspad.h">
</File>
<File
RelativePath="crypto51\pubkey.cpp">
</File>
<File
RelativePath="crypto51\pubkey.h">
</File>
<File
RelativePath="crypto51\queue.cpp">
</File>
<File
RelativePath="crypto51\queue.h">
</File>
<File
RelativePath="crypto51\randpool.cpp">
</File>
<File
RelativePath="crypto51\randpool.h">
</File>
<File
RelativePath="crypto51\rng.h">
</File>
<File
RelativePath="crypto51\rsa.cpp">
</File>
<File
RelativePath="crypto51\rsa.h">
</File>
<File
RelativePath="crypto51\secblock.h">
</File>
<File
RelativePath="crypto51\seckey.h">
</File>
<File
RelativePath="crypto51\sha.cpp">
</File>
<File
RelativePath="crypto51\sha.h">
</File>
<File
RelativePath="crypto51\simple.h">
</File>
<File
RelativePath="crypto51\smartptr.h">
</File>
<File
RelativePath="crypto51\strciphr.cpp">
</File>
<File
RelativePath="crypto51\strciphr.h">
</File>
<File
RelativePath="crypto51\words.h">
</File>
</Filter>
</Filter>
<File
stepmania/src/ezsockets.cpp
+10 -5
View File
@@ -12,7 +12,8 @@
#include "global.h"
#include "ezsockets.h"
#if defined(WIN32)
#if defined(_XBOX)
#elif defined(_WINDOWS)
#pragma comment(lib,"wsock32.lib")
#else
#include <sys/types.h>
@@ -26,7 +27,7 @@ EzSockets::EzSockets()
memset ( &addr, 0, sizeof(addr) ); //Clear the sockaddr_in structure
// Windows REQUIRES WinSock Startup
#if defined(WIN32)
#if defined(_WINDOWS) || defined(_XBOX)
WSAStartup( MAKEWORD(1,1), &wsda );
#endif
@@ -135,7 +136,11 @@ bool EzSockets::connect( const std::string& host, unsigned short port )
if (! check() )
return false;
#if defined(WIN32)
#if defined(_XBOX)
// FIXME: Xbox doesn't have gethostbyname or any way to get a hostent.
// Investigate the samples and figure out how this is supposed to work.
return false;
#elif defined(_WINDOWS)
struct hostent* phe;
addr.sin_family = AF_INET;
@@ -144,15 +149,15 @@ bool EzSockets::connect( const std::string& host, unsigned short port )
addr.sin_addr = *( (LPIN_ADDR)*phe->h_addr_list );
int desc = ::connect( sock, (struct sockaddr *)&addr, sizeof(addr) );
return desc >= 0;
#else
addr.sin_family = AF_INET;
addr.sin_port = htons( port );
inet_pton( AF_INET, host.c_str(), &addr.sin_addr );
int desc = ::connect( sock, (struct sockaddr *)&addr, sizeof(addr) );
#endif
return desc >= 0;
#endif
}
stepmania/src/ezsockets.h
+5 -3
View File
@@ -9,7 +9,9 @@
#include <fcntl.h>
#include <ctype.h>
#if defined(WIN32)
#if defined(_XBOX)
#include <WinSockX.h>
#elif defined(_WINDOWS)
#include <winsock2.h>
#else
#include <netinet/in.h>
@@ -105,8 +107,8 @@ public:
private:
//Only necessiary in windows
#if defined(WIN32)
//Only necessiary in windows, xbox
#if defined(_WINDOWS) || defined(_XBOX)
WSADATA wsda;
#endif