Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

In Qt, use mobile UI for anything non-Linux due to threads issue. So, Windows Qt UI runs fine now.

Browse source
This commit is contained in:
Sacha 2013-03-20 08:58:26 +10:00
parent 6673a938da
commit f56c397c48
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Qt/PPSSPP.pro
View file

@ -45,9 +45,7 @@ SOURCES += ../android/jni/EmuScreen.cpp \
INCLUDEPATH += .. ../Common ../native INCLUDEPATH += .. ../Common ../native
# Temporarily only use new UI for Linux desktop # Temporarily only use new UI for Linux desktop
mobile_platform { linux:!mobile_platform {
SOURCES += ../android/jni/NativeApp.cpp
} else {
MOC_DIR = moc MOC_DIR = moc
UI_DIR = ui UI_DIR = ui
RCC_DIR = rcc RCC_DIR = rcc
@ -56,6 +54,8 @@ mobile_platform {
FORMS += *.ui FORMS += *.ui
RESOURCES += resources.qrc RESOURCES += resources.qrc
INCLUDEPATH += ../Qt INCLUDEPATH += ../Qt
} else {
SOURCES += ../android/jni/NativeApp.cpp
} }
# Translations # Translations

4
android/jni/NativeApp.cpp
View file

@ -246,7 +246,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
if (g_Config.currentDirectory == "") { if (g_Config.currentDirectory == "") {
#if defined(ANDROID) #if defined(ANDROID)
g_Config.currentDirectory = external_directory; g_Config.currentDirectory = external_directory;
#elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(IOS) #elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(IOS) || defined(_WIN32)
g_Config.currentDirectory = savegame_directory; g_Config.currentDirectory = savegame_directory;
#else #else
g_Config.currentDirectory = getenv("HOME"); g_Config.currentDirectory = getenv("HOME");
@ -259,7 +259,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
// most sense. // most sense.
g_Config.memCardDirectory = std::string(external_directory) + "/"; g_Config.memCardDirectory = std::string(external_directory) + "/";
g_Config.flashDirectory = std::string(external_directory)+"/flash/"; g_Config.flashDirectory = std::string(external_directory)+"/flash/";
#elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(IOS) #elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(IOS) || defined(_WIN32)
g_Config.memCardDirectory = user_data_path; g_Config.memCardDirectory = user_data_path;
#ifdef BLACKBERRY #ifdef BLACKBERRY
g_Config.flashDirectory = "app/native/assets/flash/"; g_Config.flashDirectory = "app/native/assets/flash/";

2
native

@ -1 +1 @@
Subproject commit a0f4674f0bc86199865315d88bfe647a297d1b0e Subproject commit 3c160ecb5a848d67e2be5a165ae3a81ff8401fae