From e44a00dc8f62b7fec6696d9becdbb230880c29d1 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Fri, 12 Apr 2013 04:02:29 +1000
Subject: [PATCH] Harmattan: add app launcher, icon, fix fonts.

---
 Qt/PPSSPP.desktop | 11 +++++++++++
 Qt/PPSSPP.pro     | 13 +++++++++----
 UI/NativeApp.cpp  |  8 +++++---
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 Qt/PPSSPP.desktop

diff --git a/Qt/PPSSPP.desktop b/Qt/PPSSPP.desktop
new file mode 100644
index 000000000..6394ce113
--- /dev/null
+++ b/Qt/PPSSPP.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.7.5
+Type=Application
+Terminal=false
+Name=PPSSPP
+Exec=/opt/PPSSPP/bin/PPSSPPQt
+Icon=/usr/share/icons/hicolor/114x114/apps/icon-114.png
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index b1192ce5f..3211951ce 100755
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -85,9 +85,14 @@ symbian {
 }
 
 contains(MEEGO_EDITION,harmattan) {
-    target.path = /opt/PPSSPP/bin
-    assets.sources = ../assets/flash
-    assets.path = /home/user/MyDocs/PPSSPP
-    INSTALLS += target assets
+	target.path = /opt/PPSSPP/bin
+	assets.files = ../assets/flash
+	assets.path = /opt/PPSSPP
+	desktopfile.files = PPSSPP.desktop
+	desktopfile.path = /usr/share/applications
+	icon.files = ../assets/icon-114.png
+	icon.path = /usr/share/icons/hicolor/114x114/apps
+	INSTALLS += target assets desktopfile icon
+	ICON = ../assets/icon-114.png
 }
 
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index da26fd2d3..c0d0b336c 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -272,7 +272,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) || defined(_WIN32)
+#elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(IOS) || defined(_WIN32)
 		g_Config.currentDirectory = savegame_directory;
 #else
 		g_Config.currentDirectory = getenv("HOME");
@@ -285,12 +285,14 @@ 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) || defined(_WIN32)
+#elif defined(BLACKBERRY) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN) || defined(IOS) || defined(_WIN32)
 	g_Config.memCardDirectory = user_data_path;
 #ifdef BLACKBERRY
 	g_Config.flashDirectory = "app/native/assets/flash/";
-#elif IOS
+#elif defined(IOS)
 	g_Config.flashDirectory = std::string(external_directory) + "flash0/";
+#elif defined(MEEGO_EDITION_HARMATTAN)
+	g_Config.flashDirectory = "/opt/PPSSPP/flash/";
 #else
 	g_Config.flashDirectory = user_data_path+"/flash/";
 #endif