mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 03:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Build fix

Browse Source
This commit is contained in:
Squarepusher 2013-11-22 01:10:35 +01:00
parent b1003b7640
commit 3f47951d3d
6 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/phoenix/libs/appcompat/project.properties
View File

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-17
target=android-19
android.library=true

2
android/phoenix/project.properties
View File

@ -11,6 +11,6 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-17
target=android-19
android.library.reference.1=libs/appcompat
android.library=false

15
apple/common/RetroArch_Apple.h
View File

@ -20,6 +20,7 @@
#include <Foundation/Foundation.h>
#import <CoreFoundation/CoreFoundation.h>
#import "RAModuleInfo.h"
#include "apple_export.h"
#define GSEVENT_TYPE_KEYDOWN 10
#define GSEVENT_TYPE_KEYUP 11
@ -48,24 +49,10 @@ extern RAModuleInfo* apple_core;
extern id<RetroArch_Platform> apple_platform;
// main.m
enum basic_event_t {
RESET = 1,
LOAD_STATE = 2,
SAVE_STATE = 3,
QUIT = 4
};
extern void apple_event_basic_command(void* userdata);
extern void apple_event_set_state_slot(void* userdata);
extern void apple_event_show_rgui(void* userdata);
extern void apple_refresh_config();
extern void apple_enter_stasis();
extern void apple_exit_stasis(bool reload_config);
extern void apple_run_core(RAModuleInfo* core, const char* file);
// utility.m
extern void apple_display_alert(NSString* message, NSString* title);
extern void objc_clear_config_hack();
extern bool path_make_and_check_directory(const char* path, mode_t mode, int amode);
extern NSString* objc_get_value_from_config(config_file_t* config, NSString* name, NSString* defaultValue);

39
apple/common/apple_export.h Normal file
View File

@ -0,0 +1,39 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2013 - Jason Fetters
* Copyright (C) 2011-2013 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __APPLE_EXPORT_H
#define __APPLE_EXPORT_H
#include <stdint.h>
enum basic_event_t {
RESET = 1,
LOAD_STATE = 2,
SAVE_STATE = 3,
QUIT = 4
};
extern void apple_event_basic_command(void* userdata);
extern void apple_event_set_state_slot(void* userdata);
extern void apple_event_show_rgui(void* userdata);
extern void apple_refresh_config(void);
extern void apple_enter_stasis(void);
extern void apple_exit_stasis(bool reload_config);
extern void objc_clear_config_hack(void);
extern bool apple_is_running;
#endif

8
apple/common/utility.m
View File

@ -42,14 +42,6 @@ void apple_display_alert(NSString* message, NSString* title)
#endif
}
// Little nudge to prevent stale values when reloading the confg file
void objc_clear_config_hack()
{
g_extern.block_config_read = false;
memset(g_settings.input.overlay, 0, sizeof(g_settings.input.overlay));
memset(g_settings.video.shader_path, 0, sizeof(g_settings.video.shader_path));
}
// Fetch a value from a config file, returning defaultValue if the value is not present
NSString* objc_get_value_from_config(config_file_t* config, NSString* name, NSString* defaultValue)
{

12
frontend/platform/platform_apple.c
View File

@ -17,6 +17,7 @@
#include <dispatch/dispatch.h>
#include <pthread.h>
#include "../../apple/common/rarch_wrapper.h"
#include "../../apple/common/apple_export.h"
#include "../frontend_context.h"
@ -51,7 +52,8 @@ void apple_frontend_post_event(void (*fn)(void*), void* userdata)
void apple_event_basic_command(void* userdata)
{
switch ((enum basic_event_t)userdata)
int action = (int)userdata;
switch (action)
{
case RESET:
rarch_game_reset();
@ -80,6 +82,14 @@ void apple_event_show_rgui(void* userdata)
g_extern.lifecycle_state |= (1ULL << (in_menu ? MODE_GAME : MODE_MENU));
}
// Little nudge to prevent stale values when reloading the confg file
void objc_clear_config_hack(void)
{
g_extern.block_config_read = false;
memset(g_settings.input.overlay, 0, sizeof(g_settings.input.overlay));
memset(g_settings.video.shader_path, 0, sizeof(g_settings.video.shader_path));
}
static void event_reload_config(void* userdata)
{
objc_clear_config_hack();