libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-29 03:00:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

CXX_BUILD fixes

Browse Source
This commit is contained in:
twinaphex 2016-04-18 02:56:42 +02:00
parent ab1c26d532
commit c75143a62f
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
menu/drivers/zr_common.c
View File

@ -25,6 +25,11 @@
#include "../../gfx/drivers/gl_shaders/pipeline_zahnrad.glsl.vert.h"
#include "../../gfx/drivers/gl_shaders/pipeline_zahnrad.glsl.frag.h"
struct zr_font font;
struct zr_user_font usrfnt;
struct zr_allocator zr_alloc;
struct zr_device device;
struct zr_image zr_common_image_load(const char *filename)
{
int x,y,n;
@ -52,7 +57,7 @@ char* zr_common_file_load(const char* path, size_t* size)
void *buf;
ssize_t *length = (ssize_t*)size;
filestream_read_file(path, &buf, length);
return buf;
return (char*)buf;
}
void zr_common_device_init(struct zr_device *dev)

8
menu/drivers/zr_common.h
View File

@ -48,10 +48,10 @@
#endif
};
struct zr_font font;
struct zr_user_font usrfnt;
struct zr_allocator zr_alloc;
struct zr_device device;
extern struct zr_font font;
extern struct zr_user_font usrfnt;
extern struct zr_allocator zr_alloc;
extern struct zr_device device;
struct zr_image zr_common_image_load(const char *filename);

4
menu/menu_display.c
View File

@ -37,6 +37,8 @@
#include "../gfx/video_thread_wrapper.h"
#endif
uintptr_t menu_display_white_texture;
static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
#ifdef HAVE_D3D
&menu_display_ctx_d3d,
@ -598,7 +600,7 @@ void menu_display_handle_wallpaper_upload(void *task_data,
free(img);
}
void menu_display_allocate_white_texture()
void menu_display_allocate_white_texture(void)
{
struct texture_image ti;
static const uint8_t white_data[] = { 0xff, 0xff, 0xff, 0xff };

2
menu/menu_display.h
View File

@ -174,7 +174,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data);
void menu_display_handle_wallpaper_upload(void *task_data,
void *user_data, const char *err);
uintptr_t menu_display_white_texture;
extern uintptr_t menu_display_white_texture;
void menu_display_allocate_white_texture();
extern menu_display_ctx_driver_t menu_display_ctx_gl;