From f56c397c4861ca2f3bedfca7d19d8031cd185882 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Wed, 20 Mar 2013 08:58:26 +1000
Subject: [PATCH] In Qt, use mobile UI for anything non-Linux due to threads
 issue. So, Windows Qt UI runs fine now.

---
 Qt/PPSSPP.pro             | 6 +++---
 android/jni/NativeApp.cpp | 4 ++--
 native                    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 555c5da7d0..7152d016de 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -45,9 +45,7 @@ SOURCES += ../android/jni/EmuScreen.cpp \
 INCLUDEPATH += .. ../Common ../native
 
 # Temporarily only use new UI for Linux desktop
-mobile_platform {
-	SOURCES += ../android/jni/NativeApp.cpp
-} else {
+linux:!mobile_platform {
 	MOC_DIR = moc
 	UI_DIR = ui
 	RCC_DIR = rcc
@@ -56,6 +54,8 @@ mobile_platform {
 	FORMS += *.ui
 	RESOURCES += resources.qrc
 	INCLUDEPATH += ../Qt
+} else {
+	SOURCES += ../android/jni/NativeApp.cpp
 }
 
 # Translations
diff --git a/android/jni/NativeApp.cpp b/android/jni/NativeApp.cpp
index fd4fc1e02f..b58160f2e9 100644
--- a/android/jni/NativeApp.cpp
+++ b/android/jni/NativeApp.cpp
@@ -246,7 +246,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
 	if (g_Config.currentDirectory == "") {
 #if defined(ANDROID)
 		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;
 #else
 		g_Config.currentDirectory = getenv("HOME");
@@ -259,7 +259,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
 	// most sense.
 	g_Config.memCardDirectory = std::string(external_directory) + "/";
 	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;
 #ifdef BLACKBERRY
 	g_Config.flashDirectory = "app/native/assets/flash/";
diff --git a/native b/native
index a0f4674f0b..3c160ecb5a 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit a0f4674f0bc86199865315d88bfe647a297d1b0e
+Subproject commit 3c160ecb5a848d67e2be5a165ae3a81ff8401fae