Some preparation work for new platform support.
- Added a "PSP" compile-time define to clean up some compile time checks (replaced !WIN32 && !LINUX && !IOS with PSP) -- Wil, I am aware that this is redundant with the PSPENV variable you introduced recently, I think we can clean that up easily -- This looks like lots of changes, but most of the time I just moved some blocks here and there -- tested on VC 2010, PSP, and a bit of NDK -- I might have broken maemo, iOS, or Linux compilation, can you guys check? - Fixed some warnings reported by NDK - NDK still does not compile because recent boost additions (mutex, etc...) are apparently not supported
This commit is contained in:
+17
-17
@@ -313,22 +313,8 @@ JGE::~JGE()
|
||||
|
||||
|
||||
|
||||
#if defined (WIN32) || defined (LINUX) || defined (IOS)
|
||||
// Non-PSP code
|
||||
|
||||
void JGE::Init()
|
||||
{
|
||||
mDone = false;
|
||||
mPaused = false;
|
||||
mCriticalAssert = false;
|
||||
JRenderer::GetInstance();
|
||||
JFileSystem::GetInstance();
|
||||
JSoundSystem::GetInstance();
|
||||
LeftClickedProcessed();
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
#else ///// PSP specific code
|
||||
#if defined (PSP)
|
||||
// PSP Specific code
|
||||
|
||||
void JGE::Init()
|
||||
{
|
||||
@@ -432,7 +418,21 @@ void JGE::Run()
|
||||
}
|
||||
}
|
||||
|
||||
#endif ///// PSP specific code
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
#else ///// Non PSP code
|
||||
void JGE::Init()
|
||||
{
|
||||
mDone = false;
|
||||
mPaused = false;
|
||||
mCriticalAssert = false;
|
||||
JRenderer::GetInstance();
|
||||
JFileSystem::GetInstance();
|
||||
JSoundSystem::GetInstance();
|
||||
LeftClickedProcessed();
|
||||
}
|
||||
|
||||
#endif ///// Non PSP code
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user