Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Mac buildfix

Browse source
This commit is contained in:
Henrik Rydgård 2025-03-26 18:57:38 +01:00
parent a50b303a38
commit 6b23ce36cb
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SDL/CocoaBarItems.mm
View file

@ -20,9 +20,10 @@
#include "Common/System/System.h"
#include "Common/System/Request.h"
#include "Common/System/NativeApp.h"
#include "Core/Config.h"
#include "Common/Data/Text/I18n.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"
#include "Core/Util/RecentFiles.h"
#ifdef __cplusplus
extern "C" {
@ -622,14 +623,14 @@ TOGGLE_METHOD(FullScreen, g_Config.bFullScreen, System_MakeRequest(SystemRequest
std::shared_ptr<I18NCategory> mainmenuLocalization = GetI18NCategory(I18NCat::MAINMENU);
#define MAINMENU_LOCALIZED(key) @(mainmenuLocalization->T_cstr(key))
std::vector<std::string> recentIsos = g_Config.RecentIsos();
std::vector<std::string> recentFiles = g_recentFiles.GetRecentFiles();
NSMenuItem *openRecent = [[NSMenuItem alloc] initWithTitle:MAINMENU_LOCALIZED("Recent") action:nil keyEquivalent:@""];
NSMenu *recentsMenu = [[NSMenu alloc] init];
if (recentIsos.empty())
if (recentFiles.empty())
openRecent.enabled = NO;
for (int i = 0; i < recentIsos.size(); i++) {
std::string filename = Path(recentIsos[i]).GetFilename();
for (const auto &file : recentFiles) {
std::string filename = Path(file).GetFilename();
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@(filename.c_str()) action:@selector(openRecentItem:) keyEquivalent:@""];
item.target = self;
[recentsMenu addItem:item];
@ -640,7 +641,7 @@ TOGGLE_METHOD(FullScreen, g_Config.bFullScreen, System_MakeRequest(SystemRequest
}
-(void)openRecentItem: (NSMenuItem *)item {
System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, g_Config.RecentIsos()[item.tag].c_str());
System_PostUIMessage(UIMessage::REQUEST_GAME_BOOT, g_recentFiles.GetRecentFiles()[item.tag].c_str());
}
-(void)openSystemFileBrowser {

3
UI/PSPNSApplicationDelegate.mm
View file

@ -10,6 +10,7 @@
#import "PSPNSApplicationDelegate.h"
#include "Common/System/System.h"
#include "Core/Util/RecentFiles.h"
#include "Core/SaveState.h"
#include "Core/Config.h"
@ -33,7 +34,7 @@
- (NSMenu *)applicationDockMenu:(NSApplication *)sender {
// TODO: Actually implement a dock menu thingy.
for (std::string iso : g_Config.RecentIsos()) {
for (std::string iso : g_recentFiles.GetRecentFiles()) {
// printf("%s\n", iso.c_str());
}

2
b.sh
View file

@ -111,6 +111,8 @@ fi
# Strict errors. Any non-zero return exits this script
set -e
echo Building with $CORES_COUNT threads
mkdir -p ${BUILD_DIR}
pushd ${BUILD_DIR}