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

Merge remote-tracking branch 'upstream/master' into compressed_file_menu

Browse Source
This commit is contained in:
Timo Strunk 2014-09-06 17:51:54 +02:00
commit 38fec68fe9
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/common/RAGameView.m
View File

@ -56,7 +56,7 @@
@implementation NSScreen (IOSCompat)
- (CGRect)bounds
{
CGRect cgrect = (CGRect)NSRectToCGRect(self.frame);
CGRect cgrect = NSRectToCGRect(self.frame);
return CGRectMake(0, 0, CGRectGetWidth(cgrect), CGRectGetHeight(cgrect));
}
- (float) scale { return 1.0f; }

2
apple/common/apple_gfx_context.c.inl
View File

@ -135,7 +135,7 @@ static void apple_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned*
if (gl)
{
#if defined(OSX)
CGRect cgrect = (CGRect)NSRectToCGRect([g_view frame]);
CGRect cgrect = NSRectToCGRect([g_view frame]);
size = CGRectMake(0, 0, CGRectGetWidth(cgrect), CGRectGetHeight(cgrect));
#else
size = g_view.bounds;

11
frontend/menu/disp/lakka.c
View File

@ -1045,8 +1045,17 @@ static void lakka_init_core_info(void *data)
{
(void)data;
if (g_extern.core_info)
core_info_list_free(g_extern.core_info);
g_extern.core_info = NULL;
if (*g_settings.libretro_directory) {
g_extern.core_info = core_info_list_new(g_settings.libretro_directory);
}
if (g_extern.core_info) {
num_categories = g_extern.core_info->count + 1;
} else {
num_categories = 1;
}
}
static void *lakka_init(void)

4
location/nulllocation.c
View File

@ -16,10 +16,6 @@
#include "../driver.h"
typedef struct null_location
{
} nulllocation_t;
static void *null_location_init(void)
{
return NULL;