preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move DarwinFileSystemServices.mm/h to Core/Util

Browse Source
This commit is contained in:
Henrik Rydgård
2026-03-07 11:35:34 +01:00
parent 9885e25776
commit d6ca0378b6
12 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+13 -9
View File
@@ -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()
UI/DarwinFileSystemServices.h → Core/Util/DarwinFileSystemServices.h
+4
View File
@@ -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<void (bool, Path)> DarwinDirectoryPanelCallback;
@@ -39,3 +41,5 @@ private:
};
void RestartMacApp();
#endif
UI/DarwinFileSystemServices.mm → Core/Util/DarwinFileSystemServices.mm
-1
View File
@@ -12,7 +12,6 @@
// /var/mobile/Containers/Data/Application/<UUID>/Documents
// The /private prefix seems to be optional, so we strip it off before returning it.
#include <dispatch/dispatch.h>
#include <CoreServices/CoreServices.h>
Core/Util/VulkanEmuThread.cpp
-2
View File
@@ -1,2 +0,0 @@
#include "Core/Util/VulkanEmuThread.h"
SDL/CocoaBarItems.mm
+1 -1
View File
@@ -8,7 +8,7 @@
#import <Cocoa/Cocoa.h>
#import "PPSSPPAboutViewController.h"
#include "UI/DarwinFileSystemServices.h"
#include "Core/Util/DarwinFileSystemServices.h"
#include "UI/PSPNSApplicationDelegate.h"
#include "Core/Debugger/SymbolMap.h"
SDL/SDLMain.cpp
+1 -1
View File
@@ -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)
UI/GameSettingsScreen.cpp
+1 -1
View File
@@ -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)
UI/MainScreen.cpp
+1 -4
View File
@@ -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"
UI/NativeApp.cpp
+1 -3
View File
@@ -155,9 +155,7 @@
#include <mach-o/dyld.h>
#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"
Windows/PPSSPP.vcxproj
+2 -2
View File
@@ -1046,7 +1046,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="..\UI\DarwinFileSystemServices.h" />
<ClInclude Include="..\Core\Util\DarwinFileSystemServices.h" />
<ClInclude Include="..\UI\PSPNSApplicationDelegate.h" />
<ClInclude Include="..\UWP\App.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1349,7 +1349,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</None>
<None Include="..\settings.gradle" />
<None Include="..\UI\DarwinFileSystemServices.mm" />
<None Include="..\Core\Util\DarwinFileSystemServices.mm" />
<None Include="..\UI\PSPNSApplicationDelegate.mm">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
Windows/PPSSPP.vcxproj.filters
+2 -2
View File
@@ -568,7 +568,7 @@
<ClInclude Include="..\UI\PSPNSApplicationDelegate.h">
<Filter>Other Platforms\Mac</Filter>
</ClInclude>
<ClInclude Include="..\UI\DarwinFileSystemServices.h">
<ClInclude Include="..\Core\Util\DarwinFileSystemServices.h">
<Filter>Other Platforms\iOS</Filter>
</ClInclude>
<ClInclude Include="..\ios\ViewControllerCommon.h">
@@ -821,7 +821,7 @@
<None Include="..\UI\PSPNSApplicationDelegate.mm">
<Filter>Other Platforms\Mac</Filter>
</None>
<None Include="..\UI\DarwinFileSystemServices.mm">
<None Include="..\Core\Util\DarwinFileSystemServices.mm">
<Filter>Other Platforms\iOS</Filter>
</None>
<None Include="..\ios\ViewControllerMetal.mm">
ios/main.mm
+1 -1
View File
@@ -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)