Merge pull request #410 from xsacha/master

Pandora port
This commit is contained in:
Henrik Rydgård 2013-01-12 08:18:11 -08:00
commit 508e2512f3
2 changed files with 16 additions and 1 deletions

View File

@ -24,7 +24,7 @@ else() # Assume x86
set(X86 ON)
endif()
if(ANDROID OR BLACKBERRY OR IOS)
if(ANDROID OR BLACKBERRY OR IOS OR PANDORA)
set(HEADLESS OFF)
elseif(NOT DEFINED HEADLESS)
set(HEADLESS ON)
@ -35,6 +35,7 @@ option(ARM "Set to ON if targeting an ARM processor" ${ARM})
option(X86 "Set to ON if targeting an X86 processor" ${X86})
option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
option(BLACKBERRY "Set to ON if targeting a Blackberry device" ${BLACKBERRY})
option(PANDORA "Set to ON if targeting an OpenPandora device" ${PANDORA})
option(IOS "Set to ON if targeting an iOS device" ${IOS})
option(USING_GLES2 "Set to ON if target device uses OpenGL ES 2.0" ${USING_GLES2})
option(USING_QT_UI "Set to ON if you wish to use the Qt frontend wrapper" ${USING_QT_UI})
@ -95,6 +96,10 @@ if(IOS)
add_definitions(-DIOS)
endif()
if(PANDORA)
add_definitions(-DPANDORA)
endif()
if(ARM)
add_definitions(-DARM)
endif()
@ -415,6 +420,8 @@ elseif(SDL_FOUND)
if(APPLE)
set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm)
set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY})
elseif(PANDORA)
set(nativeExtraLibs ${nativeExtraLibs} pthread EGL X11)
endif()
if(NOT IOS) # No target
set(TargetBin PPSSPPSDL)

View File

@ -26,6 +26,14 @@
#include <signal.h>
#endif
#ifdef PANDORA
#ifdef __USE_POSIX
extern "C"
int kill (__pid_t __pid, int __sig) __THROW;
#endif
#define SIGINT 2
#endif
#undef _SP
namespace ArmGen