From 6ce3765b12f00af10819113609b40e0bd2c99757 Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Thu, 24 Jul 2014 23:20:09 +1000
Subject: [PATCH] Sailfish: More compatibility with SailFish OS. It also needs
 stddef where Maemo does. Set packaging by default for iOS with b.sh.

---
 Common/Log.h                  | 4 ----
 Core/MIPS/ARM/ArmJit.h        | 2 +-
 Core/MIPS/ARM/ArmRegCache.cpp | 2 +-
 Core/MemMap.h                 | 3 ++-
 Qt/PPSSPP.pro                 | 8 +++-----
 Qt/Platform/maemo.pri         | 2 +-
 Qt/Settings.pri               | 4 +++-
 b.sh                          | 4 +++-
 8 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Common/Log.h b/Common/Log.h
index 2c0efe5ccf..7ec9186e10 100644
--- a/Common/Log.h
+++ b/Common/Log.h
@@ -31,10 +31,6 @@
 #define	VERBOSE_LEVEL 6  // Noisy debugging - sometimes needed but usually unimportant.
 
 #if !defined(_WIN32)
-#if defined(MAEMO)
-       //ucontext.h will be then skipped
-       #define _SYS_UCONTEXT_H 1
-#endif
 #include <signal.h>
 #endif
 
diff --git a/Core/MIPS/ARM/ArmJit.h b/Core/MIPS/ARM/ArmJit.h
index ef254319f4..35fc3b83a0 100644
--- a/Core/MIPS/ARM/ArmJit.h
+++ b/Core/MIPS/ARM/ArmJit.h
@@ -23,7 +23,7 @@
 #include "Core/MIPS/ARM/ArmRegCacheFPU.h"
 #include "Core/MIPS/ARM/ArmAsm.h"
 
-#if defined(MAEMO)
+#ifndef offsetof
 #include "stddef.h"
 #endif
 
diff --git a/Core/MIPS/ARM/ArmRegCache.cpp b/Core/MIPS/ARM/ArmRegCache.cpp
index b960ea1209..02becf21c6 100644
--- a/Core/MIPS/ARM/ArmRegCache.cpp
+++ b/Core/MIPS/ARM/ArmRegCache.cpp
@@ -22,7 +22,7 @@
 #include "Core/Reporting.h"
 #include "Common/ArmEmitter.h"
 
-#if defined(MAEMO)
+#ifndef offsetof
 #include "stddef.h"
 #endif
 
diff --git a/Core/MemMap.h b/Core/MemMap.h
index d4cbf398b6..b4a3c85885 100644
--- a/Core/MemMap.h
+++ b/Core/MemMap.h
@@ -20,7 +20,8 @@
 #include <cstring>
 #ifdef __SYMBIAN32__
 #include <e32std.h>
-#elif defined(MAEMO)
+#endif
+#ifndef offsetof
 #include <stddef.h>
 #endif
 
diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro
index 835c530ed8..194f394dca 100644
--- a/Qt/PPSSPP.pro
+++ b/Qt/PPSSPP.pro
@@ -97,11 +97,9 @@ else {
 	# Grab all possible directories (win32/unix)
 	win32: PATHS = $$split($$(PATH), ;)
 	else: PATHS = $$split($$(PATH), :)
-	greaterThan(QT_MAJOR_VERSION, 4) {
-		for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt5): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt5
-	} else {
-		for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt4): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt4
-	}
+	# Either -qt4 or -qt5 will work.
+	for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt4): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt4
+	for(bin, PATHS): exists($${bin}/$${LREL_TOOL}-qt5): LREL_TOOL=$${bin}/$${LREL_TOOL}-qt5
 
 	# Translations
 	TRANSLATIONS = $$files($$P/Qt/languages/ppsspp_*.ts)
diff --git a/Qt/Platform/maemo.pri b/Qt/Platform/maemo.pri
index acb445458f..b6d0d99fad 100644
--- a/Qt/Platform/maemo.pri
+++ b/Qt/Platform/maemo.pri
@@ -1,5 +1,5 @@
 DEFINES += MAEMO __GL_EXPORTS
-contains(MEEGO_EDITION,harmattan): DEFINES += "_SYS_UCONTEXT_H=1"
+DEFINES += "_SYS_UCONTEXT_H=1"
 
 !contains(CONFIG, staticlib) {
 	# Packaging
diff --git a/Qt/Settings.pri b/Qt/Settings.pri
index 512114d1c7..e63cd81d2d 100644
--- a/Qt/Settings.pri
+++ b/Qt/Settings.pri
@@ -1,5 +1,6 @@
 VERSION = 0.9.9
 DEFINES += USING_QT_UI USE_FFMPEG
+
 # Global specific
 win32:CONFIG(release, debug|release): CONFIG_DIR = $$join(OUT_PWD,,,/release)
 else:win32:CONFIG(debug, debug|release): CONFIG_DIR = $$join(OUT_PWD,,,/debug)
@@ -8,7 +9,8 @@ OBJECTS_DIR = $$CONFIG_DIR/.obj/$$TARGET
 MOC_DIR = $$CONFIG_DIR/.moc/$$TARGET
 UI_DIR = $$CONFIG_DIR/.ui/$$TARGET
 RCC_DIR = $$CONFIG_DIR/.rcc/$$TARGET
-QMAKE_CLEAN += -r $$CONFIG_DIR/.obj $$CONFIG_DIR/.ui $$CONFIG_DIR/.moc $$CONFIG_DIR/.rcc $$TARGET
+QMAKE_CLEAN += -r $$OBJECTS_DIR $$MOC_DIR $$UI_DIR $$RCC_DIR
+
 P = $$_PRO_FILE_PWD_/..
 INCLUDEPATH += $$P/ext/zlib $$P/Common
 
diff --git a/b.sh b/b.sh
index 54fb943485..290d86cf15 100755
--- a/b.sh
+++ b/b.sh
@@ -27,9 +27,11 @@ do
 			;;
 		--ios) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=ios/ios.toolchain.cmake -GXcode ${CMAKE_ARGS}"
 			TARGET_OS=iOS
+			PACKAGE=1
 			;;
 		--android) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=android/android.toolchain.cmake ${CMAKE_ARGS}"
-			TARGET_OS="Android"
+			TARGET_OS=Android
+			PACKAGE=1
 			;;
 		--simulator) echo "Simulator mode enabled"
 			CMAKE_ARGS="-DSIMULATOR=ON ${CMAKE_ARGS}"