qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-12 13:42:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Added 3dfx driver to vid_menu

Browse source 
- renamed it back to ref_fxgl.so
This commit is contained in:
Jamie Wilkinson 2002-04-13 00:21:58 +00:00
parent 476f5e4ae9
commit 494ff6431b
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Makefile.am
View file

@ -7,7 +7,7 @@ SUBDIRS = . baseq2 ctf xatrix rogue
bin_PROGRAMS = quake2 \ bin_PROGRAMS = quake2 \
ref_soft.so ref_softx.so ref_softsdl.so \ ref_soft.so ref_softx.so ref_softsdl.so \
ref_glx.so ref_sdlgl.so ref_glx.so ref_sdlgl.so
# ref_gl.so # ref_fxgl.so
quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
\ \
@ -48,7 +48,7 @@ REF_GL_COMMON = q_sh.c q_shared.c glob.c \
ref_glx_so_SOURCES = $(REF_GL_COMMON) gl_glx.c ref_glx_so_SOURCES = $(REF_GL_COMMON) gl_glx.c
# 3dFX # 3dFX
#ref_gl_so_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c #ref_fxgl_so_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
# SDL # SDL
ref_sdlgl_so_SOURCES = $(REF_GL_COMMON) rw_sdl.c ref_sdlgl_so_SOURCES = $(REF_GL_COMMON) rw_sdl.c
@ -112,8 +112,8 @@ quake2_LDFLAGS = -lm -pthread @DL_LIBS@
ref_glx_so_LDFLAGS = -shared ref_glx_so_LDFLAGS = -shared
ref_glx_so_LDADD = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lGL ref_glx_so_LDADD = -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm -lGL
#ref_gl_so_LDFLAGS = -shared -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga #ref_fxgl_so_LDFLAGS = -shared -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga
#ref_gl_so_LDFADD = -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga #ref_fxgl_so_LDFADD = -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga
sdl_flags = @SDL_FLAGS@ sdl_flags = @SDL_FLAGS@

10
src/vid_menu.c
View file

@ -174,6 +174,16 @@ static void ApplyChanges( void *unused )
if (gl_driver->modified) if (gl_driver->modified)
vid_ref->modified = true; vid_ref->modified = true;
break; break;
case REF_FXGL:
Cvar_Set("vid_ref", "fxgl");
/* below is wrong if we use different libs for different GL reflibs */
Cvar_Set( "gl_driver", "libGL.so" );
if (gl_driver->modified)
vid_ref->modified = true;
break;
default:
/* FIXME: probably put some error message here */
break;
} }
#if 0 #if 0