maemo: Remove!

CMakeLists.txt

@@ -102,7 +102,6 @@ option(X86 "Set to ON if targeting an X86 processor" ${X86})
 # :: Platforms
 option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
 option(IOS "Set to ON if targeting an iOS device" ${IOS})
-option(MAEMO "Set to ON if targeting a Maemo (N900) device" ${MAEMO})
 option(BB "Set to ON if targeting a Beaglebone/Beaglebone Black device" ${BB})
 # :: Environments
 option(USING_EGL "Set to ON if target environment uses EGL" ${USING_EGL})
@@ -153,11 +152,6 @@ elseif(NOT IOS)
 	include(FindOpenGL REQUIRED)
 endif()
 
-if(MAEMO)
-	#Maemo's gcc-4.7.2 is strict
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
-endif()
-
 if (NOT ANDROID AND NOT IOS)
 	include(FindSDL2)
 endif()
@@ -180,9 +174,6 @@ endif()
 if(IOS)
 	add_definitions(-DIOS)
 endif()
-if(MAEMO)
-	add_definitions(-DMAEMO)
-endif()
 if(RPI)
 	add_definitions(-DRPI)
 endif()

Common/MemArena.cpp

@@ -96,9 +96,7 @@ static const std::string tmpfs_location = "/dev/shm";
 static const std::string tmpfs_ram_temp_file = "/dev/shm/gc_mem.tmp";
 
 // do not make this "static"
-#ifdef MAEMO
-std::string ram_temp_file = "/home/user/gc_mem.tmp";
-#elif defined(BB)
+#if defined(BB)
 std::string ram_temp_file = "/home/root/gc_mem.tmp";
 #else
 std::string ram_temp_file = "/tmp/gc_mem.tmp";

Core/Config.cpp

@@ -564,7 +564,7 @@ static ConfigSetting controlSettings[] = {
 	ConfigSetting("ComboKey3Mapping", &g_Config.iCombokey3, 0, true, true),
 	ConfigSetting("ComboKey4Mapping", &g_Config.iCombokey4, 0, true, true),
 
-#if !defined(IOS) && !defined(MAEMO)
+#if !defined(IOS)
 #if defined(_WIN32)
 	// A win32 user seeing touch controls is likely using PPSSPP on a tablet. There it makes
 	// sense to default this to on.

Core/Config.h

@@ -342,7 +342,7 @@ public:
 	int iCombokey3;
 	int iCombokey4;
 
-#if !defined(IOS) && !defined(MAEMO)
+#if !defined(IOS)
 	bool bShowTouchPause;
 #endif
 

Core/Reporting.cpp

@@ -262,8 +262,6 @@ namespace Reporting
 		return "Mac";
 #elif defined(LOONGSON)
 		return "Loongson";
-#elif defined(MAEMO)
-		return "Nokia Maemo";
 #elif defined(__linux__)
 		return "Linux";
 #elif defined(__Bitrig__)

Qt/PPSSPP.pro

@@ -25,7 +25,7 @@ greaterThan(QT_MAJOR_VERSION,4) {
 		DEFINES += QT_HAS_SYSTEMINFO
 	}
 	mobile_platform: QT += sensors
-} else:!maemo5:mobile_platform {
+} else:mobile_platform {
 	CONFIG += mobility
 	MOBILITY += sensors
 }

Qt/Platform/OSDetection.pri

@@ -1,16 +1,12 @@
 # This file is to add features deemed necessary that don't exist in qmake.conf
 # There is no linux setting in qmake.conf
 
-# For our purposes, maemo5 and meego perform the same.
-maemo5|contains(MEEGO_EDITION,harmattan): CONFIG += maemo
-
 # All supported platforms that require tweaks
 PLATFORM_NAME="generic"
 win32: PLATFORM_NAME="Windows"
 unix: PLATFORM_NAME="linux"
 mac: PLATFORM_NAME="macosx"
 ios: PLATFORM_NAME="ios"
-maemo: PLATFORM_NAME="maemo"
 android: PLATFORM_NAME="android"
 
 !equals(PLATFORM_NAME, "generic"): include($$PLATFORM_NAME".pri")

Qt/Platform/maemo.pri

@@ -1,14 +0,0 @@
-DEFINES += MAEMO __GL_EXPORTS
-DEFINES += "_SYS_UCONTEXT_H=1"
-
-!contains(CONFIG, staticlib) {
-	# Packaging
-	target.path = /opt/PPSSPP/bin
-	desktopfile.files = PPSSPP.desktop
-	desktopfile.path = /usr/share/applications
-	INSTALLS += target desktopfile
-	# Booster
-	QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
-	QMAKE_LFLAGS += -pie -rdynamic
-	CONFIG += qt-boostable
-}

Qt/Settings.pri

@@ -65,7 +65,7 @@ win32-msvc* {
 contains(QT_CONFIG, opengles.) {
 	DEFINES += USING_GLES2
 	# How else do we know if the environment prefers windows?
-	!equals(PLATFORM_NAME, "linux")|android|maemo {
+	!equals(PLATFORM_NAME, "linux")|android {
 		CONFIG += mobile_platform
 	}
 }

UI/GameSettingsScreen.cpp

@@ -455,9 +455,9 @@ void GameSettingsScreen::CreateViews() {
 		comboKey->OnClick.Handle(this, &GameSettingsScreen::OnCombo_key);
 		comboKey->SetEnabledPtr(&g_Config.bShowTouchControls);
 
-		// On systems that aren't iOS and Maemo, offer to let the user see this button.
+		// On non iOS systems, offer to let the user see this button.
 		// Some Windows touch devices don't have a back button or other button to call up the menu.
-#if !defined(IOS) && !defined(MAEMO)
+#if !defined(IOS)
 		CheckBox *enablePauseBtn = controlsSettings->Add(new CheckBox(&g_Config.bShowTouchPause, co->T("Show Touch Pause Menu Button")));
 
 		// Don't allow the user to disable it once in-game, so they can't lock themselves out of the menu.

UI/GamepadEmu.cpp

@@ -616,7 +616,7 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause) {
 	const int roundImage = g_Config.iTouchButtonStyle ? I_ROUND_LINE : I_ROUND;
 
 	// These platforms always need the pause menu button to be shown.
-#if defined(IOS) || defined(MAEMO)
+#if defined(IOS)
 	root->Add(new BoolButton(pause, roundImage, I_ARROW, 1.0f, new AnchorLayoutParams(halfW, 20, NONE, NONE, true)))->SetAngle(90);
 #endif
 
@@ -628,7 +628,7 @@ UI::ViewGroup *CreatePadLayout(float xres, float yres, bool *pause) {
 		const int stickBg = g_Config.iTouchButtonStyle ? I_STICK_BG_LINE : I_STICK_BG;
 		static const int comboKeyImages[5] = { I_1, I_2, I_3, I_4, I_5 };
 
-#if !defined(IOS) && !defined(MAEMO)
+#if !defined(IOS)
 		if (g_Config.bShowTouchPause)
 			root->Add(new BoolButton(pause, roundImage, I_ARROW, 1.0f, new AnchorLayoutParams(halfW, 20, NONE, NONE, true)))->SetAngle(90);
 #endif

UI/NativeApp.cpp

@@ -336,7 +336,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	// most sense.
 	g_Config.memStickDirectory = std::string(external_dir) + "/";
 	g_Config.flash0Directory = std::string(external_dir) + "/flash0/";
-#elif defined(MAEMO) || defined(IOS)
+#elif defined(IOS)
 	g_Config.memStickDirectory = user_data_path;
 	g_Config.flash0Directory = std::string(external_dir) + "/flash0/";
 #elif !defined(_WIN32)
@@ -446,7 +446,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 	if (g_Config.currentDirectory == "") {
 #if defined(__ANDROID__)
 		g_Config.currentDirectory = external_dir;
-#elif defined(MAEMO) || defined(IOS) || defined(_WIN32)
+#elif defined(IOS) || defined(_WIN32)
 		g_Config.currentDirectory = savegame_dir;
 #else
 		if (getenv("HOME") != NULL)

ext/native/base/NKCodeFromSDL.h

@@ -53,12 +53,8 @@ static const std::map<int, int> KeyMapRawSDLtoNative = InitConstMap<int, int>
 	(SDLK_PLUS, NKCODE_PLUS)
 	(SDLK_PAGEUP, NKCODE_PAGE_UP)
 	(SDLK_PAGEDOWN, NKCODE_PAGE_DOWN)
-#ifdef MAEMO
-	(SDLK_BACKSPACE, NKCODE_ESCAPE)
-#else
 	(SDLK_ESCAPE, NKCODE_ESCAPE)
 	(SDLK_BACKSPACE, NKCODE_DEL)
-#endif
 	(SDLK_DELETE, NKCODE_FORWARD_DEL)
 	(SDLK_LCTRL, NKCODE_CTRL_LEFT)
 	(SDLK_RCTRL, NKCODE_CTRL_RIGHT)

ext/native/base/PCMain.cpp

@@ -150,9 +150,6 @@ int8_t EGL_Init() {
 #endif
 		EGL_SAMPLE_BUFFERS,  0,
 		EGL_SAMPLES,         0,
-#ifdef MAEMO
-		EGL_BUFFER_SIZE, 16,
-#endif
 		EGL_NONE};
 
 	const EGLint attributes[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };

ext/native/base/QtMain.cpp

@@ -3,7 +3,7 @@
  *
  */
 // Qt 4.7+ / 5.0+ implementation of the framework.
-// Currently supports: Android, Maemo/Meego, Linux, Windows, Mac OSX
+// Currently supports: Android, Linux, Windows, Mac OSX
 
 #include <QApplication>
 #include <QUrl>
@@ -42,9 +42,7 @@ extern void mixaudio(void *userdata, Uint8 *stream, int len) {
 std::string System_GetProperty(SystemProperty prop) {
 	switch (prop) {
 	case SYSPROP_NAME:
-#if defined(MAEMO)
-		return "Qt:Maemo";
-#elif defined(__ANDROID__)
+#if defined(__ANDROID__)
 		return "Qt:Android";
 #elif defined(Q_OS_LINUX)
 		return "Qt:Linux";
@@ -69,9 +67,7 @@ int System_GetPropertyInt(SystemProperty prop) {
 	case SYSPROP_DISPLAY_REFRESH_RATE:
 		return 60000;
 	case SYSPROP_DEVICE_TYPE:
-#if defined(MAEMO)
-		return DEVICE_TYPE_MOBILE;
-#elif defined(__ANDROID__)
+#if defined(__ANDROID__)
 		return DEVICE_TYPE_MOBILE;
 #elif defined(Q_OS_LINUX)
 		return DEVICE_TYPE_DESKTOP;
@@ -183,7 +179,7 @@ MainUI::MainUI(QWidget *parent):
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     setAttribute(Qt::WA_LockLandscapeOrientation);
 #endif
-#if defined(MOBILE_DEVICE) && !defined(MAEMO)
+#if defined(MOBILE_DEVICE)
     acc = new QAccelerometer(this);
     acc->start();
 #endif
@@ -194,7 +190,7 @@ MainUI::MainUI(QWidget *parent):
 
 MainUI::~MainUI()
 {
-#if defined(MOBILE_DEVICE) && !defined(MAEMO)
+#if defined(MOBILE_DEVICE)
         delete acc;
 #endif
         NativeShutdownGraphics();
@@ -347,7 +343,7 @@ void MainUI::paintGL()
 
 void MainUI::updateAccelerometer()
 {
-#if defined(MOBILE_DEVICE) && !defined(MAEMO)
+#if defined(MOBILE_DEVICE)
         // TODO: Toggle it depending on whether it is enabled
         QAccelerometerReading *reading = acc->reading();
         if (reading) {
@@ -434,7 +430,7 @@ Q_DECL_EXPORT
 #endif
 int main(int argc, char *argv[])
 {
-#if defined(Q_OS_LINUX) && !defined(MAEMO)
+#if defined(Q_OS_LINUX)
 	QApplication::setAttribute(Qt::AA_X11InitThreads, true);
 #endif
 	QApplication a(argc, argv);
@@ -451,9 +447,6 @@ int main(int argc, char *argv[])
 #if QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
 	savegame_dir = QStandardPaths::writableLocation(QStandardPaths::HomeLocation).toStdString();
 	assets_dir = QStandardPaths::writableLocation(QStandardPaths::DataLocation).toStdString();
-#elif defined(MAEMO)
-	savegame_dir = "/home/user/MyDocs/PPSSPP";
-	assets_dir = "/opt/PPSSPP";
 #endif
 	savegame_dir += "/";
 	assets_dir += "/";

ext/native/base/QtMain.h

@@ -11,7 +11,7 @@
 #include <QAudioOutput>
 #include <QAudioFormat>
 #endif
-#if defined(MOBILE_DEVICE) && !defined(MAEMO)
+#if defined(MOBILE_DEVICE)
 #include <QAccelerometer>
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 QTM_USE_NAMESPACE
@@ -76,7 +76,7 @@ private:
 	QtDummyGraphicsContext *graphicsContext;
 
     float xscale, yscale;
-#if defined(MOBILE_DEVICE) && !defined(MAEMO)
+#if defined(MOBILE_DEVICE)
 	QAccelerometer* acc;
 #endif
 };