qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removing -3dfx's dependancy on clide

Browse source
This commit is contained in:
Chris Ison 2002-06-24 15:56:01 +00:00
parent f77bb44df3
commit 70d8026067
6 changed files with 41 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
configure.ac
View file

@ -619,32 +619,6 @@ if test "x$HAVE_DGA" != xno; then
fi
AC_SUBST(DGA_LIBS)
dnl Checks for GLIDE support
AC_ARG_WITH(glide,
[ --with-glide=DIR use the GLIDE 2.x SDK found in DIR],
HAVE_GLIDE=$withval, HAVE_GLIDE=auto)
if test "x$HAVE_GLIDE" != xno; then
AC_CHECK_LIB(glide, grGammaCorrectionValue, GLIDE_LIBS="-lglide",
AC_CHECK_LIB(glide2x, grGammaCorrectionValue, GLIDE_LIBS="-lglide2x",GLIDE_LIBS=""))
if test "x$HAVE_GLIDE" != xauto; then
GLIDE_CFLAGS="$GLIDE_CFLAGS -I$withval/include"
GLIDE_LIBS="$GLIDE_LIBS -L$withval/lib"
else
GLIDE_CFLAGS="$GLIDE_CFLAGS -I/usr/include/glide -I/usr/local/include/glide"
fi
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GLIDE_CFLAGS"
AC_CHECK_HEADER(glide.h, HAVE_GLIDE=yes, HAVE_GLIDE=no)
if test "x$HAVE_GLIDE" != xyes; then
HAVE_GLIDE=no
else
AC_DEFINE(HAVE_GLIDE, 1, [Define this if you have Glide])
fi
CPPFLAGS="$save_CPPFLAGS"
fi
AC_SUBST(GLIDE_CFLAGS)
AC_SUBST(GLIDE_LIBS)
dnl SDL/SDL-GL checks
AC_ARG_ENABLE(sdl,
[ --disable-sdl disable checking for SDL],
@ -1649,16 +1623,14 @@ if test "x$HAVE_SVGA" = xyes; then
BUILD_SW=yes
fi
CAN_BUILD_SW=yes
if test "x$HAVE_GLIDE" = xyes; then
if test "x$ENABLE_3DFX" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-3dfx\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-3dfx\$(EXEEXT)"
CL_TARGETS="$CL_TARGETS 3dfx"
VID_TARGETS="$VID_TARGETS libQFtdfx.la"
BUILD_GL=yes
fi
CAN_BUILD_GL=yes
if test "x$ENABLE_3DFX" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-3dfx\$(EXEEXT)"
NQ_TARGETS="$NQ_TARGETS nq-3dfx\$(EXEEXT)"
CL_TARGETS="$CL_TARGETS 3dfx"
VID_TARGETS="$VID_TARGETS libQFtdfx.la"
BUILD_GL=yes
fi
CAN_BUILD_GL=yes
fi
if test "x$mingw" = xyes; then
if test "x$ENABLE_WGL" = xyes; then

11
libs/video/renderer/gl/gl_funcs.c
View file

@ -147,9 +147,14 @@ QFGL_ProcAddress (void *handle, const char *name, qboolean crit)
Con_DPrintf ("not found\n");
if (crit)
Sys_Error ("Couldn't load critical OpenGL function %s, exiting...",
name);
if (crit) {
if (strncmp("fxMesa", name,6) == 0) {
Con_DPrintf ("This is a console only client. It requires a mesa-glide compatable library\n");
Con_DPrintf ("If you are trying to run QuakeForge in X, please use -glx clients\n");
}
Sys_Error ("Couldn't load critical OpenGL function %s, exiting...", name);
}
return NULL;
}

2
libs/video/targets/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLIDE_CFLAGS)
INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS)
if ASM_ARCH
asm= libasm.la

26
libs/video/targets/vid_3dfxsvga.c
View file

@ -42,8 +42,6 @@ static const char rcsid[] =
# include <dlfcn.h>
#endif
#include <glide/glide.h>
#include <glide/sst1vid.h>
#include <setjmp.h>
#include <sys/signal.h>
@ -76,6 +74,29 @@ static const char rcsid[] =
typedef struct tfxMesaContext *fxMesaContext;
typedef long FxI32;
typedef FxI32 GrScreenResolution_t;
typedef FxI32 GrDitherMode_t;
typedef FxI32 GrScreenRefresh_t;
#define GR_REFRESH_75Hz 0x3
#define GR_DITHER_2x2 0x1
#define GR_DITHER_4x4 0x2
#define GR_RESOLUTION_320x200 0x0
#define GR_RESOLUTION_320x240 0x1
#define GR_RESOLUTION_400x256 0x2
#define GR_RESOLUTION_512x384 0x3
#define GR_RESOLUTION_640x200 0x4
#define GR_RESOLUTION_640x350 0x5
#define GR_RESOLUTION_640x400 0x6
#define GR_RESOLUTION_640x480 0x7
#define GR_RESOLUTION_800x600 0x8
#define GR_RESOLUTION_960x720 0x9
#define GR_RESOLUTION_512x256 0xb
#define GR_RESOLUTION_856x480 0xa
#define GR_RESOLUTION_400x300 0xF
void (* qf_fxMesaDestroyContext) (fxMesaContext ctx);
void (* qf_fxMesaSwapBuffers) (void);
fxMesaContext (* qf_fxMesaCreateContext) (GLuint win, GrScreenResolution_t, GrScreenRefresh_t, const GLint attribList[]);
@ -382,6 +403,5 @@ VID_SetCaption (const char *text)
qboolean
VID_SetGamma (double gamma)
{
grGammaCorrectionValue((float) gamma);
return true;
}

2
nq/source/Makefile.am
View file

@ -191,7 +191,7 @@ nq_3dfx_libs= \
$(top_builddir)/libs/video/targets/libQFtdfx.la \
$(client_LIBS)
nq_3dfx_SOURCES= $(combined_sources) sys_unix.c
nq_3dfx_LDADD= $(nq_3dfx_libs) $(GLIDE_LIBS) $(SVGA_LIBS) $(NET_LIBS)
nq_3dfx_LDADD= $(nq_3dfx_libs) $(SVGA_LIBS) $(NET_LIBS)
nq_3dfx_LDFLAGS= $(common_ldflags)
nq_3dfx_DEPENDENCIES= $(nq_3dfx_libs)

2
qw/source/Makefile.am
View file

@ -218,7 +218,7 @@ qw_client_3dfx_libs= \
$(client_LIBS)
qw_client_3dfx_SOURCES= $(common_sources) $(client_sources) cl_sys_unix.c
qw_client_3dfx_LDADD= $(qw_client_3dfx_libs) \
$(GLIDE_LIBS) $(SVGA_LIBS) $(NET_LIBS)
$(SVGA_LIBS) $(NET_LIBS)
qw_client_3dfx_LDFLAGS= $(common_ldflags)
qw_client_3dfx_DEPENDENCIES= $(qw_client_3dfx_libs)