From 5d5067ed8272ae7581a439f496718b9d595195c5 Mon Sep 17 00:00:00 2001 From: Eukara Date: Tue, 3 Nov 2020 15:52:26 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5784 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/Makefile | 8 ++++---- engine/client/in_sdl.c | 2 +- engine/client/sys_sdl.c | 2 +- engine/gl/gl_vidsdl.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/Makefile b/engine/Makefile index 63890075f..bf43c2cc3 100644 --- a/engine/Makefile +++ b/engine/Makefile @@ -1017,10 +1017,10 @@ ifdef windir M_LDFLAGS=$(MLDFLAGS) -lmingw32 -lws2_32 `$(SDLCONFIG) --static-libs` SV_LDFLAGS=`$(SDLCONFIG) --static-libs` else - GL_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS) `$(SDLCONFIG) --static-libs` - VK_LDFLAGS=$(VKLDFLAGS) $(IMAGELDFLAGS) `$(SDLCONFIG) --static-libs` - M_LDFLAGS=$(MLDFLAGS) $(IMAGELDFLAGS) `$(SDLCONFIG) --static-libs` - SV_LDFLAGS=`$(SDLCONFIG) --static-libs` + GL_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS) `$(SDLCONFIG) --libs` + VK_LDFLAGS=$(VKLDFLAGS) $(IMAGELDFLAGS) `$(SDLCONFIG) --libs` + M_LDFLAGS=$(MLDFLAGS) $(IMAGELDFLAGS) `$(SDLCONFIG) --libs` + SV_LDFLAGS=`$(SDLCONFIG) --libs` endif GL_CFLAGS=-DFTE_SDL $(GLCFLAGS) `$(SDLCONFIG) --cflags` GLB_DIR=gl_$(FTE_FULLTARGET) diff --git a/engine/client/in_sdl.c b/engine/client/in_sdl.c index 79db046c8..08cefb046 100644 --- a/engine/client/in_sdl.c +++ b/engine/client/in_sdl.c @@ -8,7 +8,7 @@ #endif #if SDL_MAJOR_VERSION >=2 -SDL_Window *sdlwindow; +extern SDL_Window *sdlwindow; #else extern SDL_Surface *sdlsurf; #endif diff --git a/engine/client/sys_sdl.c b/engine/client/sys_sdl.c index d9ea4bd8d..6dc655de0 100644 --- a/engine/client/sys_sdl.c +++ b/engine/client/sys_sdl.c @@ -23,7 +23,7 @@ #endif #if SDL_MAJOR_VERSION >= 2 -SDL_Window *sdlwindow; +extern SDL_Window *sdlwindow; #endif #ifndef isDedicated diff --git a/engine/gl/gl_vidsdl.c b/engine/gl/gl_vidsdl.c index f3eb42e66..2ff950501 100644 --- a/engine/gl/gl_vidsdl.c +++ b/engine/gl/gl_vidsdl.c @@ -44,7 +44,7 @@ extern qboolean vid_isfullscreen; unsigned short intitialgammaramps[3][256]; #endif -qboolean mouseactive; +extern qboolean mouseactive; extern qboolean mouseusedforgui; #ifdef OPENGL_SDL