ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Apple) Don't have ifdef IOS conditional in apple_run_core

This commit is contained in:
Twinaphex 2014-07-19 17:28:06 +02:00
parent edc30665e7
commit 34002c0e10
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apple/common/main.m
View File

@ -42,8 +42,6 @@ void apple_run_core(NSString* core, const char* file)
char **argv; char **argv;
int argc; int argc;
(void)config_path;
[apple_platform loadingCore:core withFile:file]; [apple_platform loadingCore:core withFile:file];
apple_core = core; apple_core = core;
@ -54,7 +52,6 @@ void apple_run_core(NSString* core, const char* file)
strlcpy(file_path, file, sizeof(file_path)); strlcpy(file_path, file, sizeof(file_path));
} }
#ifdef IOS
if (core_info_has_custom_config(apple_core.UTF8String)) if (core_info_has_custom_config(apple_core.UTF8String))
core_info_get_custom_config(apple_core.UTF8String, config_path, sizeof(config_path)); core_info_get_custom_config(apple_core.UTF8String, config_path, sizeof(config_path));
else else
@ -64,12 +61,6 @@ void apple_run_core(NSString* core, const char* file)
static const char* const argv_menu[] = { "retroarch", "-c", config_path, "--menu", 0 }; static const char* const argv_menu[] = { "retroarch", "-c", config_path, "--menu", 0 };
argc = (file && core) ? 6 : 4; argc = (file && core) ? 6 : 4;
#else
static const char* const argv_game[] = { "retroarch", "-L", core_path, file_path, 0 };
static const char* const argv_menu[] = { "retroarch", "--menu", 0 };
argc = (file && core) ? 4 : 2;
#endif
argv = (char**)((file && core) ? argv_game : argv_menu); argv = (char**)((file && core) ? argv_game : argv_menu);
if (apple_rarch_load_content(&argc, argv)) if (apple_rarch_load_content(&argc, argv))