mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-20 10:20:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some CXX_BUILD buildfixes for Mac

Browse Source
This commit is contained in:
twinaphex 2021-11-05 02:16:40 +01:00
parent 97753bad7c
commit 18412e34c1
4 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/retroarch.yml vendored
View File

@ -22,14 +22,3 @@ jobs:
run: ./configure run: ./configure
- name: Build - name: Build
run: make C89_BUILD=1 run: make C89_BUILD=1
linux-cxx:
runs-on: ubuntu-latest
steps:
- name: Dependencies
run: sudo apt-get install build-essential libxkbcommon-dev libx11-xcb-dev zlib1g-dev libfreetype6-dev libegl1-mesa-dev libgles2-mesa-dev libgbm-dev nvidia-cg-toolkit nvidia-cg-dev libavcodec-dev libsdl2-dev libsdl-image1.2-dev libxml2-dev yasm
- name: Checkout
uses: actions/checkout@v2
- name: Configure
run: ./configure
- name: Build
run: make CXX_BUILD=1

2
cheevos/cheevos.c
View File

@ -91,7 +91,7 @@ static rcheevos_locals_t rcheevos_locals =
0, /* menuitem_capacity */ 0, /* menuitem_capacity */
0, /* menuitem_count */ 0, /* menuitem_count */
#endif #endif
{0}, /* load_info */ {RCHEEVOS_LOAD_STATE_NONE, 0, 0 }, /* load_info */
false,/* hardcore_active */ false,/* hardcore_active */
false,/* loaded */ false,/* loaded */
true, /* core_supports */ true, /* core_supports */

16
frontend/drivers/platform_darwin.m
View File

@ -468,9 +468,6 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
if (path_is_valid(assets_zip_path)) if (path_is_valid(assets_zip_path))
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
RARCH_LOG("Assets ZIP found at [%s], setting up bundle assets extraction...\n", assets_zip_path);
RARCH_LOG("Extraction dir will be: %s\n", home_dir_buf);
configuration_set_string(settings, configuration_set_string(settings,
settings->arrays.bundle_assets_src, settings->arrays.bundle_assets_src,
assets_zip_path); assets_zip_path);
@ -493,14 +490,12 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
path_mkdir(bundle_path_buf); path_mkdir(bundle_path_buf);
if (access(bundle_path_buf, 0755) != 0) if (access(bundle_path_buf, 0755) != 0) { }
RARCH_ERR("Failed to create or access base directory: %s\n", bundle_path_buf);
else else
{ {
path_mkdir(g_defaults.dirs[DEFAULT_DIR_SYSTEM]); path_mkdir(g_defaults.dirs[DEFAULT_DIR_SYSTEM]);
if (access(g_defaults.dirs[DEFAULT_DIR_SYSTEM], 0755) != 0) if (access(g_defaults.dirs[DEFAULT_DIR_SYSTEM], 0755) != 0) { }
RARCH_ERR("Failed to create or access system directory: %s.\n", g_defaults.dirs[DEFAULT_DIR_SYSTEM]);
} }
CFRelease(bundle_path); CFRelease(bundle_path);
@ -936,11 +931,8 @@ static bool accessibility_speak_macos(int speed,
} }
pid = fork(); pid = fork();
if (pid < 0) /* Could not fork for say command */
{ if (pid < 0) { }
/* error */
RARCH_LOG("ERROR: could not fork for say command.\n");
}
else if (pid > 0) else if (pid > 0)
{ {
/* parent process */ /* parent process */

8
ui/drivers/cocoa/cocoa_common.m
View File

@ -136,10 +136,6 @@ void *glkitview_init(void);
{ {
NSURL *fileURL = [NSURL URLFromPasteboard:pboard]; NSURL *fileURL = [NSURL URLFromPasteboard:pboard];
NSString *s = [fileURL path]; NSString *s = [fileURL path];
if (s != nil)
{
RARCH_LOG("Drop name is: %s\n", [s UTF8String]);
}
} }
return YES; return YES;
} }
@ -326,11 +322,7 @@ void *cocoa_screen_get_chosen(void)
monitor_index = settings->uints.video_monitor_index; monitor_index = settings->uints.video_monitor_index;
if (monitor_index >= screens.count) if (monitor_index >= screens.count)
{
RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead.");
return (BRIDGE void*)screens; return (BRIDGE void*)screens;
}
return ((BRIDGE void*)[screens objectAtIndex:monitor_index]); return ((BRIDGE void*)[screens objectAtIndex:monitor_index]);
} }