nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-29 15:12:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

MinGL & Merged targets added to SDL. Dedicated server, OpenGL & Software rendered SDL clients now build in Linux

Browse source 
and run but untested. r3162 was to resolve the SDL MinGL's build error: undefined reference to `NET_Sleep'


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3163 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2009-04-07 03:48:32 +00:00
parent aac9ba3f4f
commit 84117bd7e3
3 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engine/Makefile
View file

@ -488,7 +488,24 @@ SWCL_DIR=swcl_sdl$(BITS)
SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(SERVERONLY_OBJS) SV_OBJS=$(COMMON_OBJS) $(SERVER_OBJS) $(PROGS_OBJS) $(SERVERONLY_OBJS)
SV_EXE_NAME=../fteqw.sv$(BITS) SV_EXE_NAME=../fteqw.sv$(BITS)
SV_CFLAGS=$(SERVER_ONLY_CFLAGS) SV_CFLAGS=$(SERVER_ONLY_CFLAGS) -lz
MINGL_DIR=mingl_sdl$(BITS)
MINGL_EXE_NAME=../fteqw_sdl.mingl$(BITS)
MB_DIR=m_sdl$(BITS)
M_EXE_NAME=../fteqw_sdl$(BITS)
MCL_OBJS=$(GLQUAKE_OBJS) $(SOFTWARE_OBJS) gl_vidsdl.o vid_sdl.o snd_sdl.o cd_sdl.o sys_sdl.o in_sdl.o
M_CFLAGS=$(SWCFLAGS) $(GLCFLAGS) `sdl-config --cflags` -D_MERGED_SDL
M_LDFLAGS=$(GLLDFLAGS) $(IMAGELDFLAGS)
ifdef windir
M_LDFLAGS=$(MLDFLAGS) -lmingw32 -lwsock32 -lSDLmain -lSDL
else
#pthread is needed because of SDL.
M_LDFLAGS=$(MLDFLAGS) `sdl-config --libs` $(IMAGELDFLAGS)
endif
#specific targets override those defaults as needed. #specific targets override those defaults as needed.

2
engine/gl/gl_vidsdl.c
View file

@ -18,7 +18,9 @@ HWND mainwindow;
extern qboolean vid_isfullscreen; extern qboolean vid_isfullscreen;
#ifdef IN_XFLIP
cvar_t in_xflip = {"in_xflip", "0"}; cvar_t in_xflip = {"in_xflip", "0"};
#endif
unsigned short intitialgammaramps[3][256]; unsigned short intitialgammaramps[3][256];

6
engine/sw/vid_sdl.c
View file

@ -16,7 +16,11 @@ extern SDL_Surface *sdlsurf;
qbyte vid_curpal[768]; qbyte vid_curpal[768];
cvar_t in_xflip = {"in_xflip", "0"}; #ifdef IN_XFLIP
#ifndef _MERGED_SDL // in_xflip is in both SW and GL SDL renderers.
cvar_t in_xflip = {"in_xflip", "0"};
#endif
#endif
void ResetFrameBuffers(void) void ResetFrameBuffers(void)
{ {