CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-14 22:38:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix OSX/Windows build.

Browse Source
This commit is contained in:
Themaister 2013-10-08 22:45:08 +02:00
parent ee3b000425
commit fee10d3d76
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apple/common/RAGameView.m
View File

@ -381,7 +381,8 @@ void apple_gfx_ctx_update_window_title(void)
{
#ifdef OSX
static char buf[128], buf_fps[128];
bool got_text = gfx_get_fps(buf, sizeof(buf), false, buf_fps, sizeof(buf_fps));
bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
bool got_text = gfx_get_fps(buf, sizeof(buf), fps_draw ? buf_fps : NULL, sizeof(buf_fps));
static const char* const text = buf; // < Can't access buf directly in the block
if (got_text)
@ -393,6 +394,9 @@ void apple_gfx_ctx_update_window_title(void)
g_view.window.title = @(text);
});
}
if (fps_draw)
msg_queue_push(g_extern.msg_queue, buf_fps, 1, 1);
#endif
}

6
core_info.c
View File

@ -212,7 +212,11 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list, const
for (size_t i = 0; i < core_info_list->count; i++, supported++)
{
const core_info_t *core = &core_info_list->list[i];
if (!core_info_does_support_file(core, path) && !core_info_does_support_any_file(core, list))
if (!core_info_does_support_file(core, path)
#ifdef HAVE_ZLIB
&& !core_info_does_support_any_file(core, list)
#endif
)
break;
}

10
gfx/d3d9/d3d9.cpp
View File

@ -489,8 +489,8 @@ D3DVideo::D3DVideo(const video_info_t *info) :
win_height = rect.bottom - rect.top;
}
char buffer[128], buffer_fps[128];
gfx_get_fps(buffer, sizeof(buffer), false, buffer_fps, sizeof(buffer_fps));
char buffer[128];
gfx_get_fps(buffer, sizeof(buffer), nullptr, 0);
std::string title = buffer;
title += " || Direct3D9";
@ -1007,13 +1007,17 @@ void D3DVideo::deinit_font()
void D3DVideo::update_title()
{
char buffer[128], buffer_fps[128];
if (gfx_get_fps(buffer, sizeof(buffer), false, buffer_fps, sizeof(buffer_fps)))
bool fps_draw = g_extern.lifecycle_mode_state & (1ULL << MODE_FPS_DRAW);
if (gfx_get_fps(buffer, sizeof(buffer), fps_draw ? buffer_fps : NULL, sizeof(buffer_fps)))
{
std::string title = buffer;
title += " || Direct3D9";
SetWindowText(hWnd, title.c_str());
}
if (fps_draw)
msg_queue_push(g_extern.msg_queue, buffer_fps, 1, 1);
g_extern.frame_count++;
}