From 6266065384de5952d8ae3c7ec0f24fe15b56abe5 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 16 Aug 2018 09:59:51 +0200 Subject: [PATCH] Fix more code when compiling without menu support --- command.c | 15 ++++++++------- gfx/drivers/gl.c | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/command.c b/command.c index 7b0dcc878c..0c128985f4 100644 --- a/command.c +++ b/command.c @@ -255,13 +255,14 @@ bool command_set_shader(const char *arg) static bool command_version(const char* arg) { - char reply[256] = {0}; + char reply[256] = {0}; - sprintf(reply, "%s\n", PACKAGE_VERSION); + sprintf(reply, "%s\n", PACKAGE_VERSION); #if defined(HAVE_CHEEVOS) && (defined(HAVE_STDIN_CMD) || defined(HAVE_NETWORK_CMD) && defined(HAVE_NETWORKING)) - command_reply(reply, strlen(reply)); + command_reply(reply, strlen(reply)); #endif - return true; + + return true; } #if defined(HAVE_COMMAND) && defined(HAVE_CHEEVOS) @@ -556,10 +557,10 @@ bool command_network_send(const char *cmd_) } free(command); - return ret; -#else - return false; + if (ret) + return true; #endif + return false; } #ifdef HAVE_STDIN_CMD diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c index d3e7dfd2a4..f47cc488c4 100644 --- a/gfx/drivers/gl.c +++ b/gfx/drivers/gl.c @@ -832,7 +832,6 @@ static void gl_set_osd_msg(void *data, font_driver_render_msg(video_info, font, msg, (const struct font_params *)params); } -#if defined(HAVE_MENU) static void gl_show_mouse(void *data, bool state) { video_context_driver_show_mouse(&state); @@ -847,6 +846,7 @@ static struct video_shader *gl_get_current_shader(void *data) return shader_info.data; } +#if defined(HAVE_MENU) static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info) { video_shader_ctx_coords_t coords;