From e1985eeb4f235e1481690bcf77896f5d4d5b8eeb Mon Sep 17 00:00:00 2001 From: FOTMarut Date: Sat, 2 May 2020 17:25:49 +0200 Subject: [PATCH] ref_soft: de-duplicated symbols - Compiles correctly with GCC 10 now --- ref_soft/r_bsp.c | 2 -- ref_soft/r_context.c | 3 --- ref_soft/r_glblit.c | 1 + 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/ref_soft/r_bsp.c b/ref_soft/r_bsp.c index 816bf538..1f67242f 100644 --- a/ref_soft/r_bsp.c +++ b/ref_soft/r_bsp.c @@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // // current entity info // -qboolean insubmodel; - // the currently rendering entity vec3_t r_entorigin; // the currently rendering entity in world // coordinates diff --git a/ref_soft/r_context.c b/ref_soft/r_context.c index d81123b2..e0b1e6a9 100644 --- a/ref_soft/r_context.c +++ b/ref_soft/r_context.c @@ -17,14 +17,11 @@ GNU General Public License for more details. ref_api_t gEngfuncs; ref_globals_t *gpGlobals; -ref_instance_t RI; gl_globals_t tr; ref_speeds_t r_stats; byte *r_temppool; cvar_t *gl_emboss_scale; -cvar_t *r_drawentities; cvar_t *r_norefresh; -cvar_t *vid_gamma; cvar_t *vid_brightness; viddef_t vid; static void GAME_EXPORT R_ClearScreen( void ) diff --git a/ref_soft/r_glblit.c b/ref_soft/r_glblit.c index e59227dd..a46ef98d 100644 --- a/ref_soft/r_glblit.c +++ b/ref_soft/r_glblit.c @@ -1,4 +1,5 @@ #include "r_local.h" +#define APIENTRY_LINKAGE static #include "../ref_gl/gl_export.h" struct swblit_s