Join both Maemo platforms (Maemo5 + Meego Harmattan/Maemo 6) to MAEMO define. Technically they are very similar and anything that wasn't already defined for both probably needed to be.

This commit is contained in:
Sacha
2014-06-18 03:42:31 +10:00
parent 73aa17a2de
commit ea17e17ebd
11 changed files with 14 additions and 22 deletions
+2 -2
View File
@@ -315,9 +315,9 @@ void GameSettingsScreen::CreateViews() {
layoutEditorChoice_->OnClick.Handle(this, &GameSettingsScreen::OnTouchControlLayout);
layoutEditorChoice_->SetEnabledPtr(&g_Config.bShowTouchControls);
// On systems that aren't Symbian, iOS, and Meego Harmattan, offer to let the user see this button.
// On systems that aren't Symbian, iOS, and Maemo, 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(__SYMBIAN32__) && !defined(IOS) && !defined(MEEGO_EDITION_HARMATTAN)
#if !defined(__SYMBIAN32__) && !defined(IOS) && !defined(MAEMO)
CheckBox *enablePauseBtn = controlsSettings->Add(new CheckBox(&g_Config.bShowTouchPause, c->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.