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:
wagic.the.homebrew
2011-04-21 13:16:11 +00:00
parent 5eb36fecc0
commit 8ff6839c8d
26 changed files with 257 additions and 252 deletions

View File

@@ -27,10 +27,7 @@
#include <windows.h>
#define WITH_FMOD
#elif defined (LINUX) || defined (IOS)
#else
#elif defined (PSP)
#include <pspgu.h>
#include <pspkernel.h>
#include <pspdisplay.h>
@@ -73,16 +70,17 @@ public:
#else
#if defined (WIN32) || defined (LINUX) || defined (IOS)
#if defined (PSP)
JMP3* mTrack;
#else
#ifdef WITH_FMOD
FSOUND_SAMPLE* mTrack; // MP3 needed to be of "sample" type for FMOD, FMUSIC_MODULE is for MODs
#else
void* mTrack;
#endif
#else
JMP3* mTrack;
#endif
#endif
#endif //WITH_FMOD
#endif //PSP
#endif //USE_PHONON
};
@@ -97,19 +95,20 @@ class JSample
int mVoice;
unsigned long fileSize();
#if defined (WIN32) || defined (LINUX) || defined (IOS)
#if defined (PSP)
WAVDATA *mSample;
#else
#ifdef WITH_FMOD
FSOUND_SAMPLE *mSample;
#else
#ifdef USE_PHONON
Phonon::AudioOutput* mOutput;
Phonon::MediaObject* mMediaObject;
#endif
#endif //USE_PHONON
void* mSample;
#endif
#else
WAVDATA *mSample;
#endif
#endif //WITH_FMOD
#endif //PSP
};