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

Fix some CXX_BUILD errors

This commit is contained in:
twinaphex 2015-03-16 16:57:27 +01:00
parent a0f242e1a2
commit 80a6673004
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
input/drivers/linuxraw_input.c
View File

@ -217,7 +217,7 @@ static const rarch_joypad_driver_t *linuxraw_get_joypad_driver(void *data)
{ {
linuxraw_input_t *linuxraw = (linuxraw_input_t*)data; linuxraw_input_t *linuxraw = (linuxraw_input_t*)data;
if (!linuxraw) if (!linuxraw)
return false; return NULL;
return linuxraw->joypad; return linuxraw->joypad;
} }

3
menu/drivers/glui.c
View File

@ -219,6 +219,7 @@ static void glui_get_message(const char *message)
static void glui_render_messagebox(const char *message) static void glui_render_messagebox(const char *message)
{ {
unsigned i; unsigned i;
uint32_t normal_color;
int x, y; int x, y;
struct string_list *list = NULL; struct string_list *list = NULL;
glui_handle_t *glui = NULL; glui_handle_t *glui = NULL;
@ -249,7 +250,7 @@ static void glui_render_messagebox(const char *message)
x = gl->win_width / 2 - strlen(list->elems[0].data) * glui->glyph_width / 2; x = gl->win_width / 2 - strlen(list->elems[0].data) * glui->glyph_width / 2;
y = gl->win_height / 2 - list->size * glui->line_height / 2; y = gl->win_height / 2 - list->size * glui->line_height / 2;
const uint32_t normal_color = FONT_COLOR_ARGB_TO_RGBA(g_settings.menu.entry_normal_color); normal_color = FONT_COLOR_ARGB_TO_RGBA(g_settings.menu.entry_normal_color);
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {

8
menu/drivers/rgui.c
View File

@ -270,6 +270,7 @@ static void rgui_render_messagebox(const char *message)
size_t i; size_t i;
int x, y; int x, y;
unsigned width, glyphs_width, height; unsigned width, glyphs_width, height;
uint16_t color;
struct string_list *list = NULL; struct string_list *list = NULL;
menu_handle_t *menu = menu_driver_resolve(); menu_handle_t *menu = menu_driver_resolve();
@ -317,7 +318,7 @@ static void rgui_render_messagebox(const char *message)
fill_rect(&menu->frame_buf, x + 5, y + height - 5, width - 5, 5, green_filler); fill_rect(&menu->frame_buf, x + 5, y + height - 5, width - 5, 5, green_filler);
fill_rect(&menu->frame_buf, x, y + 5, 5, height - 5, green_filler); fill_rect(&menu->frame_buf, x, y + 5, 5, height - 5, green_filler);
uint16_t color = NORMAL_COLOR; color = NORMAL_COLOR;
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
@ -346,6 +347,7 @@ static void rgui_render(void)
char title[256], title_buf[256], title_msg[64]; char title[256], title_buf[256], title_msg[64];
char timedate[PATH_MAX_LENGTH]; char timedate[PATH_MAX_LENGTH];
unsigned x, y, menu_type = 0; unsigned x, y, menu_type = 0;
uint16_t hover_color, normal_color;
const char *dir = NULL; const char *dir = NULL;
const char *label = NULL; const char *label = NULL;
const char *core_name = NULL; const char *core_name = NULL;
@ -402,8 +404,8 @@ static void rgui_render(void)
menu_animation_ticker_line(title_buf, RGUI_TERM_WIDTH - 3, menu_animation_ticker_line(title_buf, RGUI_TERM_WIDTH - 3,
g_runloop.frames.video.count / RGUI_TERM_START_X, title, true); g_runloop.frames.video.count / RGUI_TERM_START_X, title, true);
uint16_t hover_color = HOVER_COLOR; hover_color = HOVER_COLOR;
uint16_t normal_color = NORMAL_COLOR; normal_color = NORMAL_COLOR;
blit_line(menu, RGUI_TERM_START_X + RGUI_TERM_START_X, RGUI_TERM_START_X, title_buf, TITLE_COLOR); blit_line(menu, RGUI_TERM_START_X + RGUI_TERM_START_X, RGUI_TERM_START_X, title_buf, TITLE_COLOR);