mirror of
https://github.com/libretro/RetroArch.git
synced 2025-02-21 10:11:18 +00:00
Get rid of compile-time ifdefs inside get_chosen_screen
This commit is contained in:
parent
2c42ad3c96
commit
9a38ec28b0
@ -137,9 +137,6 @@ static float get_from_selector(Class obj_class, id obj_id, SEL selector, CGFloat
|
||||
|
||||
void *get_chosen_screen(void)
|
||||
{
|
||||
#if defined(HAVE_COCOA) && !defined(MAC_OS_X_VERSION_10_6)
|
||||
return [RAScreen mainScreen];
|
||||
#else
|
||||
settings_t *settings = config_get_ptr();
|
||||
NSArray *screens = [RAScreen screens];
|
||||
if (!screens || !settings)
|
||||
@ -149,9 +146,9 @@ void *get_chosen_screen(void)
|
||||
{
|
||||
RARCH_WARN("video_monitor_index is greater than the number of connected monitors; using main screen instead.\n");
|
||||
#if __has_feature(objc_arc)
|
||||
return (__bridge void*)RAScreen.mainScreen;
|
||||
return (__bridge void*)screens;
|
||||
#else
|
||||
return (void*)RAScreen.mainScreen;
|
||||
return (void*)screens;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -160,7 +157,6 @@ void *get_chosen_screen(void)
|
||||
#else
|
||||
return ((void*)[screens objectAtIndex:settings->video.monitor_index]);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
float get_backing_scale_factor(void)
|
||||
|
@ -314,7 +314,7 @@
|
||||
"-DHAVE_HID",
|
||||
"-DHAVE_XMB",
|
||||
"-DHAVE_MMAP",
|
||||
"-DHAVE_LIBRETRODB",
|
||||
"-DHAVE_LIBRETRODB",
|
||||
"-DHAVE_FILTERS_BUILTIN",
|
||||
);
|
||||
OTHER_LDFLAGS = "-lz";
|
||||
|
Loading…
x
Reference in New Issue
Block a user