thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Qt for Maemo

Browse source
This commit is contained in:
Sacha 2014-01-05 10:53:47 +10:00
parent 0673808282
commit a2dfb0f5ea
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/QtMain.cpp
View file

@ -35,6 +35,8 @@ std::string System_GetProperty(SystemProperty prop) {
return "Qt:Blackberry"; return "Qt:Blackberry";
#elif defined(MEEGO_EDITION_HARMATTAN) #elif defined(MEEGO_EDITION_HARMATTAN)
return "Qt:Meego"; return "Qt:Meego";
#elif defined(MAEMO)
return "Qt:Maemo";
#elif defined(Q_OS_LINUX) #elif defined(Q_OS_LINUX)
return "Qt:Linux"; return "Qt:Linux";
#elif defined(_WIN32) #elif defined(_WIN32)
@ -100,7 +102,7 @@ Q_DECL_EXPORT
#endif #endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef Q_OS_LINUX #if defined(Q_OS_LINUX) && !defined(MAEMO)
QApplication::setAttribute(Qt::AA_X11InitThreads, true); QApplication::setAttribute(Qt::AA_X11InitThreads, true);
#endif #endif
QApplication a(argc, argv); QApplication a(argc, argv);
@ -118,7 +120,7 @@ int main(int argc, char *argv[])
#elif defined(BLACKBERRY) #elif defined(BLACKBERRY)
const char *savegame_dir = "/accounts/1000/shared/misc/"; const char *savegame_dir = "/accounts/1000/shared/misc/";
const char *assets_dir = "app/native/assets/"; const char *assets_dir = "app/native/assets/";
#elif defined(MEEGO_EDITION_HARMATTAN) #elif defined(MEEGO_EDITION_HARMATTAN) || defined(MAEMO)
const char *savegame_dir = "/home/user/MyDocs/PPSSPP/"; const char *savegame_dir = "/home/user/MyDocs/PPSSPP/";
const char *assets_dir = "/opt/PPSSPP/"; const char *assets_dir = "/opt/PPSSPP/";
#else #else

6
base/QtMain.h
View file

@ -9,7 +9,7 @@
#include <QAudioOutput> #include <QAudioOutput>
#include <QAudioFormat> #include <QAudioFormat>
#ifdef USING_GLES2 #if defined(USING_GLES2) && !defined(MAEMO)
#include <QAccelerometer> #include <QAccelerometer>
QTM_USE_NAMESPACE QTM_USE_NAMESPACE
#endif #endif
@ -193,7 +193,7 @@ protected:
void updateAccelerometer() void updateAccelerometer()
{ {
#ifdef USING_GLES2 #if defined(USING_GLES2) && !defined(MAEMO)
// TODO: Toggle it depending on whether it is enabled // TODO: Toggle it depending on whether it is enabled
QAccelerometerReading *reading = acc->reading(); QAccelerometerReading *reading = acc->reading();
if (reading) { if (reading) {
@ -206,7 +206,7 @@ protected:
private: private:
InputState input_state; InputState input_state;
#ifdef USING_GLES2 #if defined(USING_GLES2) && !defined(MAEMO)
QAccelerometer* acc; QAccelerometer* acc;
#endif #endif
}; };