From d6ca0378b6ec14016199718af63abadf6ec843ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 7 Mar 2026 11:35:34 +0100 Subject: [PATCH] Move DarwinFileSystemServices.mm/h to Core/Util --- CMakeLists.txt | 22 +++++++++++-------- {UI => Core/Util}/DarwinFileSystemServices.h | 4 ++++ {UI => Core/Util}/DarwinFileSystemServices.mm | 1 - Core/Util/VulkanEmuThread.cpp | 2 -- SDL/CocoaBarItems.mm | 2 +- SDL/SDLMain.cpp | 2 +- UI/GameSettingsScreen.cpp | 2 +- UI/MainScreen.cpp | 5 +---- UI/NativeApp.cpp | 4 +--- Windows/PPSSPP.vcxproj | 4 ++-- Windows/PPSSPP.vcxproj.filters | 4 ++-- ios/main.mm | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) rename {UI => Core/Util}/DarwinFileSystemServices.h (94%) rename {UI => Core/Util}/DarwinFileSystemServices.mm (99%) delete mode 100644 Core/Util/VulkanEmuThread.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index be57bb0c75..b454a4b9cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1386,8 +1386,6 @@ elseif(IOS AND NOT LIBRETRO) ios/iCade/iCadeReaderView.h ios/iCade/iCadeReaderView.m ios/iCade/iCadeState.h - UI/DarwinFileSystemServices.mm - UI/DarwinFileSystemServices.h Common/Battery/AppleBatteryClient.m ) @@ -1412,7 +1410,7 @@ elseif(IOS AND NOT LIBRETRO) ios/AudioEngine.mm ios/LocationHelper.mm ios/Controls.mm - UI/DarwinFileSystemServices.mm + Core/Util/DarwinFileSystemServices.mm Common/Battery/AppleBatteryClient.m Common/Render/Text/draw_text_cocoa.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) @@ -1435,11 +1433,8 @@ elseif(USING_QT_UI) endif() if(APPLE) list(APPEND NativeAppSource - UI/DarwinFileSystemServices.mm - UI/DarwinFileSystemServices.h Common/Battery/AppleBatteryClient.m) set_source_files_properties(Common/Battery/AppleBatteryClient.m - UI/DarwinFileSystemServices.mm Common/Render/Text/draw_text_cocoa.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) list(APPEND nativeExtraLibs ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY} ${IOKIT_LIBRARY}) @@ -1509,8 +1504,6 @@ else() SDL/PPSSPPAboutViewController.m SDL/PPSSPPAboutViewController.h SDL/MacCameraHelper.mm - UI/DarwinFileSystemServices.mm - UI/DarwinFileSystemServices.h Common/Battery/AppleBatteryClient.m UI/PSPNSApplicationDelegate.mm UI/PSPNSApplicationDelegate.h) @@ -1518,7 +1511,7 @@ else() # TODO # set_source_files_properties(SDL/SDLMain.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) - set_source_files_properties(UI/DarwinFileSystemServices.mm + set_source_files_properties(Core/Util/DarwinFileSystemServices.mm UI/PSPNSApplicationDelegate.mm SDL/CocoaMetalLayer.mm SDL/CocoaBarItems.mm @@ -2090,6 +2083,12 @@ if(LINUX OR ANDROID OR MACOSX OR IOS) ) endif() +if(MACOSX OR IOS) + list(APPEND CoreExtra + Core/Util/DarwinFileSystemServices.mm + Core/Util/DarwinFileSystemServices.h) +endif() + # 'ppsspp_jni' on ANDROID, 'Core' everywhere else # SHARED on ANDROID, STATIC everywhere else add_library(${CoreLibName} ${CoreLinkType} @@ -2531,6 +2530,11 @@ add_library(${CoreLibName} ${CoreLinkType} ${CMAKE_CURRENT_BINARY_DIR}/git-version.cpp ) +if(MACOSX OR IOS) + set_source_files_properties(Core/Util/DarwinFileSystemServices.mm + PROPERTIES COMPILE_FLAGS -fobjc-arc) +endif() + if(LIBRETRO) target_include_directories(${CoreLibName} PRIVATE libretro/libretro-common/include) endif() diff --git a/UI/DarwinFileSystemServices.h b/Core/Util/DarwinFileSystemServices.h similarity index 94% rename from UI/DarwinFileSystemServices.h rename to Core/Util/DarwinFileSystemServices.h index 447097219b..5c5102f71a 100644 --- a/UI/DarwinFileSystemServices.h +++ b/Core/Util/DarwinFileSystemServices.h @@ -11,6 +11,8 @@ #include "Common/File/Path.h" #include "Common/System/Request.h" +#if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC) + #define PreferredMemoryStickUserDefaultsKey "UserPreferredMemoryStickDirectoryPath" typedef std::function DarwinDirectoryPanelCallback; @@ -39,3 +41,5 @@ private: }; void RestartMacApp(); + +#endif diff --git a/UI/DarwinFileSystemServices.mm b/Core/Util/DarwinFileSystemServices.mm similarity index 99% rename from UI/DarwinFileSystemServices.mm rename to Core/Util/DarwinFileSystemServices.mm index 28fbd393b0..2d49e5ba38 100644 --- a/UI/DarwinFileSystemServices.mm +++ b/Core/Util/DarwinFileSystemServices.mm @@ -12,7 +12,6 @@ // /var/mobile/Containers/Data/Application//Documents // The /private prefix seems to be optional, so we strip it off before returning it. - #include #include diff --git a/Core/Util/VulkanEmuThread.cpp b/Core/Util/VulkanEmuThread.cpp deleted file mode 100644 index 798e45af51..0000000000 --- a/Core/Util/VulkanEmuThread.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "Core/Util/VulkanEmuThread.h" - diff --git a/SDL/CocoaBarItems.mm b/SDL/CocoaBarItems.mm index 472a3d3c9e..aedfdcb271 100644 --- a/SDL/CocoaBarItems.mm +++ b/SDL/CocoaBarItems.mm @@ -8,7 +8,7 @@ #import #import "PPSSPPAboutViewController.h" -#include "UI/DarwinFileSystemServices.h" +#include "Core/Util/DarwinFileSystemServices.h" #include "UI/PSPNSApplicationDelegate.h" #include "Core/Debugger/SymbolMap.h" diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp index 25ff82fa03..d18c62df05 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp @@ -76,7 +76,7 @@ SDLJoystick *joystick = NULL; #endif #if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS) -#include "UI/DarwinFileSystemServices.h" +#include "Core/Util/DarwinFileSystemServices.h" #endif #if PPSSPP_PLATFORM(MAC) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 853f031ff5..d22d8c9e42 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -82,7 +82,7 @@ #include "GPU/GPU.h" #if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS) -#include "UI/DarwinFileSystemServices.h" +#include "Core/Util/DarwinFileSystemServices.h" #endif #if defined(_WIN32) && !PPSSPP_PLATFORM(UWP) diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index be0ba46d06..9e908f6d9a 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -68,10 +68,7 @@ #include "Core/Config.h" #include "Core/Loaders.h" #include "Common/Data/Text/I18n.h" - -#if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC) -#include "UI/DarwinFileSystemServices.h" // For the browser -#endif +#include "Core/Util/DarwinFileSystemServices.h" // For the browser #include "Core/HLE/sceUmd.h" diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 4abdcfaa50..d5d64d0483 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -155,9 +155,7 @@ #include #endif -#if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC) -#include "UI/DarwinFileSystemServices.h" -#endif +#include "Core/Util/DarwinFileSystemServices.h" #if !defined(__LIBRETRO__) #include "Core/Util/GameDB.h" diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj index ce02ea5f10..8135b96df9 100644 --- a/Windows/PPSSPP.vcxproj +++ b/Windows/PPSSPP.vcxproj @@ -1046,7 +1046,7 @@ true true - + true @@ -1349,7 +1349,7 @@ true - + true true diff --git a/Windows/PPSSPP.vcxproj.filters b/Windows/PPSSPP.vcxproj.filters index 0c700e2048..687e8ba4b0 100644 --- a/Windows/PPSSPP.vcxproj.filters +++ b/Windows/PPSSPP.vcxproj.filters @@ -568,7 +568,7 @@ Other Platforms\Mac - + Other Platforms\iOS @@ -821,7 +821,7 @@ Other Platforms\Mac - + Other Platforms\iOS diff --git a/ios/main.mm b/ios/main.mm index 6942697bb1..b442521084 100644 --- a/ios/main.mm +++ b/ios/main.mm @@ -40,7 +40,7 @@ #include "Core/Config.h" #include "Common/Log.h" #include "Common/Log/LogManager.h" -#include "UI/DarwinFileSystemServices.h" +#include "Core/Util/DarwinFileSystemServices.h" // Compile out all the hackery in app store builds. #if !PPSSPP_PLATFORM(IOS_APP_STORE)