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

Merge pull request #16834 from SerenaKit/serena/memory-stick-dir-customization

Browse Source 
Make changes requested by unknown
This commit is contained in:
Unknown W. Brackets authored and GitHub committed 2023-01-22 14:13:01 -08:00
2 parents 09f8a256e7 13122ddd12
commit d8d23e2282
5 files changed
+11 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CMakeLists.txt
+5 -5
View File
@@ -1148,8 +1148,8 @@ elseif(IOS)
ios/iCade/iCadeReaderView.h
ios/iCade/iCadeReaderView.m
ios/iCade/iCadeState.h
Common/DarwinMemoryStickManager.mm
Common/DarwinMemoryStickManager.h
UI/DarwinMemoryStickManager.mm
UI/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 -framework CoreServices" )
@@ -1169,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_source_files_properties(UI/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set(TargetBin PPSSPP)
elseif(USING_QT_UI)
set(CMAKE_AUTOMOC ON)
@@ -1227,8 +1227,8 @@ 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 Common/DarwinMemoryStickManager.mm)
set_source_files_properties(Common/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set(nativeExtra ${nativeExtra} SDL/SDLMain.h SDL/SDLMain.mm SDL/SDLCocoaMetalLayer.h SDL/SDLCocoaMetalLayer.mm UI/DarwinMemoryStickManager.mm)
set_source_files_properties(UI/DarwinMemoryStickManager.mm PROPERTIES COMPILE_FLAGS -fobjc-arc)
set(nativeExtraLibs ${nativeExtraLibs} ${COCOA_LIBRARY} ${QUARTZ_CORE_LIBRARY})
elseif(USING_EGL)
set(nativeExtraLibs ${nativeExtraLibs} pthread)
Common/DarwinMemoryStickManager.h → UI/DarwinMemoryStickManager.h
View File
File renamed without changes.
Common/DarwinMemoryStickManager.mm → UI/DarwinMemoryStickManager.mm
View File
File renamed without changes.
UI/GameSettingsScreen.cpp
+5 -5
View File
@@ -75,7 +75,7 @@
#include "GPU/Common/FramebufferManagerCommon.h"
#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
#include "Common/DarwinMemoryStickManager.h"
#include "UI/DarwinMemoryStickManager.h"
#endif
#if defined(_WIN32) && !PPSSPP_PLATFORM(UWP)
@@ -1166,16 +1166,16 @@ UI::EventReturn GameSettingsScreen::OnJitAffectingSetting(UI::EventParams &e) {
}
UI::EventReturn GameSettingsScreen::OnChangeMemStickDir(UI::EventParams &e) {
#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
#if PPSSPP_PLATFORM(MAC) || PPSSPP_PLATFORM(IOS)
DarwinMemoryStickManager memoryStickManager;
DarwinDirectoryPanelCallback callback = [] (Path thePathChosen) {
DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory(thePathChosen);
DarwinMemoryStickManager::setUserPreferredMemoryStickDirectory(thePathChosen);
};
memoryStickManager.presentDirectoryPanel(callback);
#else
#else
screenManager()->push(new MemStickScreen(false));
#endif
#endif
return UI::EVENT_DONE;
}
UI/NativeApp.cpp
+1 -1
View File
@@ -142,7 +142,7 @@
#endif
#if PPSSPP_PLATFORM(IOS) || PPSSPP_PLATFORM(MAC)
#include "Common/DarwinMemoryStickManager.h"
#include "UI/DarwinMemoryStickManager.h"
#endif
ScreenManager *screenManager;