mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-03 17:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CXX_BUILD

Browse Source
This commit is contained in:
twinaphex 2015-07-12 08:08:27 +02:00
parent 135ee2f503
commit bbc63f7e99
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/video_common.h
View File

@ -25,6 +25,10 @@
typedef float GRfloat; typedef float GRfloat;
typedef unsigned int GRuint; typedef unsigned int GRuint;
#ifdef __cplusplus
extern "C" {
#endif
struct gfx_fbo_rect struct gfx_fbo_rect
{ {
unsigned img_width; unsigned img_width;
@ -88,4 +92,8 @@ bool gfx_coord_array_add(gfx_coord_array_t *ca,
void gfx_coord_array_free(gfx_coord_array_t *ca); void gfx_coord_array_free(gfx_coord_array_t *ca);
#ifdef __cplusplus
}
#endif
#endif #endif

12
input/input_autodetect.c
View File

@ -80,21 +80,27 @@ static int input_try_autoconfigure_joypad_from_conf(config_file_t *conf,
&& input_pid != 0) && input_pid != 0)
{ {
score += 3; score += 3;
//RARCH_LOG("Autoconf: VID/PID match score=%d\n", score); #if 0
RARCH_LOG("Autoconf: VID/PID match score=%d\n", score);
#endif
} }
/* Check for name match */ /* Check for name match */
if (!strcmp(ident, params->name)) if (!strcmp(ident, params->name))
{ {
score += 2; score += 2;
//RARCH_LOG("Autoconf: exact name match score=%d\n", score); #if 0
RARCH_LOG("Autoconf: exact name match score=%d\n", score);
#endif
} }
else else
{ {
if (ident[0] != '\0' && !strncmp(params->name, ident, strlen(ident))) if (ident[0] != '\0' && !strncmp(params->name, ident, strlen(ident)))
{ {
score += 1; score += 1;
//RARCH_LOG("Autoconf: partial name match score=%d\n", score); #if 0
RARCH_LOG("Autoconf: partial name match score=%d\n", score);
#endif
} }
} }
RARCH_LOG("Autoconf: configuration score=%d\n", score); RARCH_LOG("Autoconf: configuration score=%d\n", score);

8
libretro-common/include/formats/image.h
View File

@ -20,6 +20,10 @@
#include <stdint.h> #include <stdint.h>
#include <boolean.h> #include <boolean.h>
#ifdef __cplusplus
extern "C" {
#endif
enum image_process_code enum image_process_code
{ {
IMAGE_PROCESS_ERROR = -2, IMAGE_PROCESS_ERROR = -2,
@ -51,4 +55,8 @@ bool texture_image_color_convert(unsigned r_shift,
bool texture_image_load(struct texture_image *img, const char *path); bool texture_image_load(struct texture_image *img, const char *path);
void texture_image_free(struct texture_image *img); void texture_image_free(struct texture_image *img);
#ifdef __cplusplus
}
#endif
#endif #endif

3
menu/cbs/menu_cbs_ok.c
View File

@ -1697,11 +1697,12 @@ static int action_ok_video_resolution(const char *path,
#else #else
if (video_driver_get_video_output_size(&width, &height)) if (video_driver_get_video_output_size(&width, &height))
{ {
char msg[PATH_MAX_LENGTH] = {0};
video_driver_set_video_mode(width, height, true); video_driver_set_video_mode(width, height, true);
global->console.screen.resolutions.width = width; global->console.screen.resolutions.width = width;
global->console.screen.resolutions.height = height; global->console.screen.resolutions.height = height;
char msg[PATH_MAX_LENGTH] = {0};
snprintf(msg, sizeof(msg),"Applying: %dx%d\n START to reset",width, height); snprintf(msg, sizeof(msg),"Applying: %dx%d\n START to reset",width, height);
rarch_main_msg_queue_push(msg, 1, 100, true); rarch_main_msg_queue_push(msg, 1, 100, true);
} }