Memory stick customization for Darwin

CMakeLists.txt

@@ -1148,8 +1148,11 @@ elseif(IOS)
 		ios/iCade/iCadeReaderView.h
 		ios/iCade/iCadeReaderView.m
 		ios/iCade/iCadeState.h
+        Common/DarwinMemoryStickManager.mm
+        Common/DarwinMemoryStickManager.h
 	)
-	set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework MediaPlayer -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework UIKit -framework GLKit -framework OpenAL -framework AVFoundation -framework CoreLocation -framework CoreVideo -framework CoreMedia" )
+    
+	set(nativeExtraLibs ${nativeExtraLibs} "-framework Foundation -framework MediaPlayer -framework AudioToolbox -framework CoreGraphics -framework QuartzCore -framework UIKit -framework GLKit -framework OpenAL -framework AVFoundation -framework CoreLocation -framework CoreVideo -framework CoreMedia -framework CoreServices" )
 	if(EXISTS "${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks/GameController.framework")
 		set(nativeExtraLibs ${nativeExtraLibs} "-weak_framework GameController")
 	endif()
@@ -1166,7 +1169,7 @@ elseif(IOS)
 	set_source_files_properties(ios/main.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set_source_files_properties(ios/CameraHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set_source_files_properties(ios/LocationHelper.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
-
+    set_source_files_properties(Common/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
 	set(TargetBin PPSSPP)
 elseif(USING_QT_UI)
 	set(CMAKE_AUTOMOC ON)
@@ -1224,7 +1227,7 @@ elseif(TARGET SDL2::SDL2)
 	endif()
 	set(nativeExtraLibs ${nativeExtraLibs} SDL2::SDL2)
 	if(APPLE)
-		set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm SDL/SDLCocoaMetalLayer.h SDL/SDLCocoaMetalLayer.mm)
+		set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm SDL/SDLCocoaMetalLayer.h SDL/SDLCocoaMetalLayer.mm Common/DarwinMemoryStickManager.mm)
 		set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY})
 	elseif(USING_EGL)
 		set(nativeExtraLibs ${nativeExtraLibs} pthread)

Common/DarwinMemoryStickManager.h

@@ -0,0 +1,38 @@
+//
+//  DarwinMemoryStickManager.h
+//  PPSSPP
+//
+//  Created by Serena on 20/01/2023.
+//
+
+#ifndef DarwinMemoryStickManager_h
+#define DarwinMemoryStickManager_h
+
+#include "ppsspp_config.h"
+#include "Common/File/Path.h"
+
+#define PreferredMemoryStickUserDefaultsKey "UserPreferredMemoryStickDirectoryPath"
+
+typedef std::function<void (Path)> DarwinDirectoryPanelCallback;
+
+/// A Class to manage the memory stick on Darwin (macOS, iOS) platforms,
+/// consisting of meth(od)s to present the directory panel
+/// to choose the user preferred memory stick directory,
+/// to determine the appropriate memory stick directory,
+/// and to *set* the preferred memory stick directory.
+class DarwinMemoryStickManager {
+public:
+    /// Present a pannel to choose the directory as the memory stick manager.
+    void presentDirectoryPanel(DarwinDirectoryPanelCallback);
+    
+    static Path appropriateMemoryStickDirectoryToUse();
+    static void setUserPreferredMemoryStickDirectory(Path);
+private:
+    static Path __defaultMemoryStickPath();
+#if PPSSPP_PLATFORM(IOS)
+    // iOS only, needed for UIDocumentPickerViewController
+    void *__pickerDelegate = NULL;
+#endif // PPSSPP_PLATFORM(IOS)
+};
+
+#endif /* DarwinMemoryStickManager_h */

Common/DarwinMemoryStickManager.mm

@@ -0,0 +1,98 @@
+//
+//  DarwinMemoryStickManager.mm
+//  PPSSPP
+//
+//  Created by Serena on 20/01/2023.
+//
+
+#include "ppsspp_config.h"
+#include "Core/Config.h"
+#include "DarwinMemoryStickManager.h"
+#include <dispatch/dispatch.h>
+#include <CoreServices/CoreServices.h>
+
+#if !__has_feature(objc_arc)
+#error Must be built with ARC, please revise the flags for DarwinMemoryStickManager.mm to include -fobjc-arc.
+#endif
+
+#if __has_include(<UIKit/UIKit.h>)
+#include <UIKit/UIKit.h>
+
+@interface DocumentPickerDelegate : NSObject <UIDocumentPickerDelegate>
+@property DarwinDirectoryPanelCallback callback;
+@end
+
+@implementation DocumentPickerDelegate
+-(instancetype)initWithCallback: (DarwinDirectoryPanelCallback)callback {
+    if (self = [super init]) {
+        self.callback = callback;
+    }
+    
+    return self;
+}
+
+- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
+    // Notice: we could've hardcoded behaviour here to call
+    // `DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory`
+    // But for the sake of flexibility in the future, i'll just call a provided callback.
+    if (urls.count >= 1) self.callback(Path(urls[0].path.UTF8String));
+}
+
+@end
+
+#else
+#include <AppKit/AppKit.h>
+#endif // __has_include(<UIKit/UIKit.h>)
+
+void DarwinMemoryStickManager::presentDirectoryPanel(DarwinDirectoryPanelCallback callback) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+#if PPSSPP_PLATFORM(MAC)
+        NSOpenPanel *panel = [[NSOpenPanel alloc] init];
+        panel.allowsMultipleSelection = NO;
+        panel.canChooseFiles = NO;
+        panel.canChooseDirectories = YES;
+        panel.allowedFileTypes = @[(__bridge NSString *)kUTTypeFolder];
+        
+        NSModalResponse modalResponse = [panel runModal];
+        if (modalResponse == NSModalResponseOK && panel.URLs && panel.URLs.firstObject)
+            callback(Path(panel.URLs.firstObject.path.UTF8String));
+#elif PPSSPP_PLATFORM(IOS)
+        if (UIWindow *window = [UIApplication.sharedApplication keyWindow]) {
+            if (UIViewController *viewController = window.rootViewController) {
+                NSString *folderUTType = (__bridge NSString *)kUTTypeFolder;
+                UIDocumentPickerViewController *pickerVC = [[UIDocumentPickerViewController alloc]
+                                                            initWithDocumentTypes:@[folderUTType] inMode:UIDocumentPickerModeOpen];
+                // What if you wanted to go to heaven, but then God showed you the next few lines?
+                // serious note: have to do this, because __pickerDelegate has to stay retained as a class property
+                __pickerDelegate = (void *)CFBridgingRetain([[DocumentPickerDelegate alloc] initWithCallback:callback]);
+                pickerVC.delegate = (__bridge DocumentPickerDelegate *)__pickerDelegate;
+                [viewController presentViewController:pickerVC animated:true completion:nil];
+            }
+        }
+#endif
+    });
+}
+
+Path DarwinMemoryStickManager::appropriateMemoryStickDirectoryToUse() {
+    NSString *userPreferred = [[NSUserDefaults standardUserDefaults] stringForKey:@(PreferredMemoryStickUserDefaultsKey)];
+    if (userPreferred)
+        return Path(userPreferred.UTF8String);
+    
+    return __defaultMemoryStickPath();
+}
+
+Path DarwinMemoryStickManager::__defaultMemoryStickPath() {
+#if PPSSPP_PLATFORM(IOS)
+    NSString *documentsPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES)
+                               objectAtIndex:0];
+    return Path(documentsPath.UTF8String);
+#elif PPSSPP_PLATFORM(MAC)
+    return g_Config.defaultCurrentDirectory / ".config/ppsspp";
+#endif
+}
+
+void DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory(Path path) {
+    [[NSUserDefaults standardUserDefaults] setObject:@(path.c_str())
+                                              forKey:@(PreferredMemoryStickUserDefaultsKey)];
+    g_Config.memStickDirectory = path;
+}

UI/GameSettingsScreen.cpp

@@ -74,6 +74,10 @@
 #include "GPU/GPUInterface.h"
 #include "GPU/Common/FramebufferManagerCommon.h"
 
+#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+#include "Common/DarwinMemoryStickManager.h"
+#endif
+
 #if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
 #pragma warning(disable:4091)  // workaround bug in VS2015 headers
 #include "Windows/MainWindow.h"
@@ -891,6 +895,10 @@ void GameSettingsScreen::CreateViews() {
 	systemSettings->Add(new Choice(sy->T("Show Memory Stick folder")))->OnClick.Handle(this, &GameSettingsScreen::OnOpenMemStick);
 #endif
 
+#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+	systemSettings->Add(new Choice(sy->T("Set Memory Stick folder")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMemStickDir);
+#endif
+
 #if PPSSPP_PLATFORM(ANDROID)
 	memstickDisplay_ = g_Config.memStickDirectory.ToVisualString();
 	auto memstickPath = systemSettings->Add(new ChoiceWithValueDisplay(&memstickDisplay_, sy->T("Memory Stick folder", "Memory Stick folder"), (const char *)nullptr));
@@ -1158,7 +1166,16 @@ UI::EventReturn GameSettingsScreen::OnJitAffectingSetting(UI::EventParams &e) {
 }
 
 UI::EventReturn GameSettingsScreen::OnChangeMemStickDir(UI::EventParams &e) {
+	#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
+    DarwinMemoryStickManager memoryStickManager;
+	DarwinDirectoryPanelCallback callback = [] (Path thePathChosen) {
+        DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory(thePathChosen);
+    };
+	
+	memoryStickManager.presentDirectoryPanel(callback);
+	#else
 	screenManager()->push(new MemStickScreen(false));
+	#endif
 	return UI::EVENT_DONE;
 }
 

UI/NativeApp.cpp

@@ -141,6 +141,10 @@
 #include <mach-o/dyld.h>
 #endif
 
+#if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC)
+#include "Common/DarwinMemoryStickManager.h"
+#endif
+
 ScreenManager *screenManager;
 std::string config_filename;
 
@@ -538,11 +542,11 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 
 #elif PPSSPP_PLATFORM(IOS)
 	g_Config.defaultCurrentDirectory = g_Config.internalDataDirectory;
-	g_Config.memStickDirectory = Path(user_data_path);
+    g_Config.memStickDirectory = DarwinMemoryStickManager::appropriateMemoryStickDirectoryToUse();
 	g_Config.flash0Directory = Path(std::string(external_dir)) / "flash0";
 #elif PPSSPP_PLATFORM(MAC)
 	g_Config.defaultCurrentDirectory = Path(getenv("HOME"));
-	g_Config.memStickDirectory = g_Config.defaultCurrentDirectory / ".config/ppsspp";
+    g_Config.memStickDirectory = DarwinMemoryStickManager::appropriateMemoryStickDirectoryToUse();
 	g_Config.flash0Directory = Path(std::string(external_dir)) / "flash0";
 #elif PPSSPP_PLATFORM(SWITCH)
 	g_Config.memStickDirectory = g_Config.internalDataDirectory / "config/ppsspp";

assets/lang/ar_AE.ini

@@ -1179,6 +1179,7 @@ Save path in My Documents = ‎مسار الحفظ في مستنداتي
 Savestate Slot = ‎منطقة حفظ الحالة
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = ‎PNG إحفظ لقطة الشاشة في صيغة
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = ‎حدد خلفية الواجهة...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/az_AZ.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/bg_BG.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = слот за запазено състояние
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Запази снимка в PNG формат
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/ca_ES.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/cz_CZ.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Cesta pro uložení dat je v Dokumentech
 Savestate Slot = Pozice uložené hry
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Ukládat snímky obrazovky ve formátu PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/da_DK.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Gem sti i Mine Dokumenter
 Savestate Slot = Lagerplads for spil-status
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Gem skærmdumps i PNG format
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Sæt UI baggrund...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/de_DE.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Speicherpfad in "Meine Dokumente"
 Savestate Slot = Speicherplatz
 Savestate slot backups = Backups für Speicherplatz
 Screenshots as PNG = Screenshots im PNG-Format speichern
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Setze Menühintergrund...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/dr_ID.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Alai gambara'na PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/en_US.ini

@@ -1186,6 +1186,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show region flag = Show region flag

assets/lang/es_ES.ini

@@ -1172,6 +1172,7 @@ Save path in My Documents = Carpeta de guardado en "Mis documentos"
 Savestate Slot = Ranura de estado guardado
 Savestate slot backups = Ranura de backups de estados guardados
 Screenshots as PNG = Capturas en PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Definir imagen de fondo...
 Show ID = Mostrar ID
 Show Memory Stick folder = Mostrar directorio Memory Stick

assets/lang/es_LA.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Guardar ruta en\n"C:/Users/(tu usuario)/Documents"
 Savestate Slot = Ranura de estado guardado
 Savestate slot backups = Copias de seguridad de estado guardado
 Screenshots as PNG = Capturas en PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Colocar fondo de interfaz...
 Show ID = Mostrar ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/fa_IR.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = ذخیره در داکیومنت ها
 Savestate Slot = Savestate slot
 Savestate slot backups = پشتیبان گیری از داده
 Screenshots as PNG = ‎باشد PNG اسکرین شات با فرمت
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = ‎... تنظیم تصویر پس زمینه
 Show ID =  ایدی
 Show Memory Stick folder = نمایش پوشه حافظه

assets/lang/fi_FI.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/fr_FR.ini

@@ -1162,6 +1162,7 @@ Save path in My Documents = Chemin de sauvegarde dans "Mes documents"
 Savestate Slot = Emplacement d'état
 Savestate slot backups = Emplacement d'état de secours
 Screenshots as PNG = Enregistrer les captures d'écran au format .png
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Définir un fond d'écran...
 Show ID = Afficher l'identifiant
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/gl_ES.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Carpeta de gardado en Meus documentos
 Savestate Slot = Ranura de estado gardado
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Capturas en PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/gr_EL.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Αποθήκευση διαδρομής στα Έγ
 Savestate Slot = Slot Σημείου Αποθήκευσης
 Savestate slot backups = Αντίγραφα ασφαλείας slot σημείων αποθήκευσης
 Screenshots as PNG = Αποθήκευση Στιγμιοτύπων ως PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Ορισμός φόντου UI...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/he_IL.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = שמור צילום מסך כ PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/he_IL_invert.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = PNG כ ךסמ םוליצ רומש
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/hr_HR.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Spremi put u My Documents
 Savestate Slot = Savestate mjesto
 Savestate slot backups = Savestate mjesto backup-ovi
 Screenshots as PNG = Spremi snimak zaslona u PNG formatu
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Postavi UI pozadinu...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/hu_HU.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Mentés helye a Dokumentumok mappában
 Savestate Slot = Állapotmentés sorszáma
 Savestate slot backups = Állapotmentések sorszámonkénti biztonsági másolata
 Screenshots as PNG = Képek mentése PNG formátumban
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Kezelőfelület hátterének beállítása…
 Show ID = Azonosító megjelenítése
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/id_ID.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Simpan jalur dalam dokumen saya
 Savestate Slot = Slot simpanan status
 Savestate slot backups = Slot cadangan simpanan status
 Screenshots as PNG = Simpan tangkapan layar dalam format PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Gunakan latar belakang UI kustom...
 Show ID = Tampilkan ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/it_IT.ini

@@ -1139,6 +1139,7 @@ No animation = Nessuna animazione
 Path does not exist! = Il percorso non esiste!
 PSP Memory Stick = Memory Stick PSP
 Recent games = Giochi recenti
+Set Memory Stick folder = Set Memory Stick folder
 Show Memory Stick folder = Mostra cartella Memory Stick
 Theme = Tema
 Transparent UI background = Transparent UI background

assets/lang/ja_JP.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = パスを My Documents に保存する
 Savestate Slot = セーブステートのスロット
 Savestate slot backups = セーブステートのスロットをバックアップする
 Screenshots as PNG = スクリーンショットをPNG形式で保存する
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = UIの背景を設定する...
 Show ID = IDを表示する
 Show region flag = 地域の旗を表示する

assets/lang/jv_ID.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Nyimpen path ing Dokumen kulo
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Gambar minangka PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/ko_KR.ini

@@ -1182,6 +1182,7 @@ Save path in My Documents = 내 문서에 경로 저장
 Savestate Slot = 저장 상태 슬롯
 Savestate slot backups = 저장 상태 슬롯 백업
 Screenshots as PNG = 스크린샷을 PNG 형식으로 저장
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = UI 배경 설정...
 Show ID = ID 표시
 Show region flag = 지역 플래그 표시

assets/lang/lo_LA.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = ບັນທຶກຂໍ້ມູນໄວ້ທີ
 Savestate Slot = ຊ່ອງເກັບເຊບ
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = ຈັບພາບໜ້າຈໍເປັນ PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = ປ່ຽນພາບພື້ນຫຼັງ...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/lt-LT.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Išsaugojimo statuso vieta
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Išsaugoti nuotraukas PNG formatu
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/ms_MY.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Slot Savestate
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Simpan pembidik skrin sebagai format PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/nl_NL.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Opslagpad in Mijn documenten
 Savestate Slot = Savestatesleuf
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Screenshots opslaan in PNG-formaat
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = UI-achtergrond instellen...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/no_NO.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Save screenshots in PNG format
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/pl_PL.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Ścieżka zapisu w Dokumentach
 Savestate Slot = Slot zapisu stanu
 Savestate slot backups = Kopie zapasowe slota zapisu stanu
 Screenshots as PNG = Zapisuj zrzuty ekranu jako PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Zmień tło interfejsu...
 Show ID = Show ID
 Show Memory Stick folder = Pokaż folder Karty Pamięci

assets/lang/pt_BR.ini

@@ -1186,6 +1186,7 @@ Save path in My Documents = Caminho do save em Meus Documentos
 Savestate Slot = Slot do state salvo
 Savestate slot backups = Backups dos slots dos states salvos
 Screenshots as PNG = Salvar as screenshots no formato PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Definir o cenário de fundo da interface do usuário...
 Show ID = Mostrar ID
 Show region flag = Mostrar a bandeira da região

assets/lang/pt_PT.ini

@@ -1187,6 +1187,7 @@ Save path in My Documents = Caminho do save em Meus Documentos
 Savestate Slot = Espaço do estado salvo
 Savestate slot backups = Backups dos espaços dos estados salvos
 Screenshots as PNG = Salvar as Capturas de Tela em formato .png
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Definir o cenário de fundo da interface do usuário...
 Show ID = Mostrar ID
 Show region flag = Mostrar a bandeira da região

assets/lang/ro_RO.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Slot salvare
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Salvează instantanee în format PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/ru_RU.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Путь до сохранений в "Мои док
 Savestate Slot = Слот состояния
 Savestate slot backups = Резервные копии слота состояния
 Screenshots as PNG = Сохранять скриншоты в PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Изменить фон интерфейса...
 Show ID = Показывать ID
 Show Memory Stick folder = Показать папку Memory Stick

assets/lang/sv_SE.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Sparkatalog i Dokument
 Savestate Slot = Savestate slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Skärmdumpar som PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Välj UI-bakgrund...
 Show ID = Show ID
 Show Memory Stick folder = Visa Memory Stick-mappen

assets/lang/tg_PH.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = I-save sa direksyon na "Aking Dokumento"
 Savestate Slot =  Savestate Slot
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = I-save ang Screenshot sa PNG na pormat
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Magtakda ng UI background...
 Show ID = Ipakita ang ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/th_TH.ini

@@ -1177,6 +1177,7 @@ Save path in My Documents = บันทึกข้อมูลไว้ที
 Savestate Slot = ช่องเก็บเซฟสเตทเกม
 Savestate slot backups = สำรองข้อมูลเซฟสเตท
 Screenshots as PNG = จับภาพหน้าจอเป็นไฟล์ PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = เปลี่ยนภาพพื้นหลัง...
 Show ID = แสดงไอดี/เวอร์ชั่นเกม
 Show Memory Stick folder = แสดงโฟลเดอร์เม็มโมรี่สติ๊ก

assets/lang/tr_TR.ini

@@ -1172,6 +1172,7 @@ Save path in My Documents = Dosyaları "Belgeler"'e kaydet
 Savestate Slot = Durum kaydı yeri
 Savestate slot backups = Durum kaydı slot yedekleri
 Screenshots as PNG = Ekran görüntülerini PNG olarak kaydet
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Arayüz arkaplanı ayarla...
 Show ID = ID'yi göster
 Show Memory Stick folder = Hafıza Kartı klasörünü göster

assets/lang/uk_UA.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Шлях до збережень в Моїх док
 Savestate Slot = Слот пам'яті
 Savestate slot backups = Резервні копії слота стану
 Screenshots as PNG = Скріншот в PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Змінити фон інтерфейсу...
 Show ID = Показати ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/vi_VN.ini

@@ -1171,6 +1171,7 @@ Save path in My Documents = Save path in My Documents
 Savestate Slot = Ô save
 Savestate slot backups = Savestate slot backups
 Screenshots as PNG = Chụp ảnh màn hình bằng định dạng PNG
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = Set UI background...
 Show ID = Show ID
 Show Memory Stick folder = Show Memory Stick folder

assets/lang/zh_CN.ini

@@ -1165,6 +1165,7 @@ Save path in My Documents = 存档路径在我的文档
 Savestate Slot = 即时存档插槽
 Savestate slot backups = 即时存档插槽备份
 Screenshots as PNG = 将截图保存为PNG格式
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = 设置界面背景...
 Show ID = 显示游戏ID
 Show region flag = 显示游戏区域标识

assets/lang/zh_TW.ini

@@ -1162,6 +1162,7 @@ Save path in My Documents = 儲存路徑於「我的文件」
 Savestate Slot = 存檔插槽
 Savestate slot backups = 存檔插槽備份
 Screenshots as PNG = 以 PNG 格式儲存螢幕截圖
+Set Memory Stick folder = Set Memory Stick folder
 Set UI background... = 設定 UI 背景…
 Show ID = 顯示 ID
 Show region flag = 顯示區域旗幟

cmake/Toolchains/ios.cmake

@@ -31,9 +31,9 @@ set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(IOS ON)
 set(CMAKE_CROSSCOMPILING ON)
 set(CMAKE_MACOSX_BUNDLE YES)
+set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${IPHONEOS_DEPLOYMENT_TARGET})
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
 set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
-set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${IPHONEOS_DEPLOYMENT_TARGET})
 
 # Setup iOS platform unless specified manually with IOS_PLATFORM
 if(NOT DEFINED IOS_PLATFORM)