qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-29 07:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

No more requiring the 3dfxgl for -3dfx!

Browse source 
We now first try mesa with 3dfx support, then the 3dfxgl..
This commit is contained in:
Zephaniah E. Hull 2000-03-14 09:46:23 +00:00
parent 73030d89a2
commit 7f8dbfdebc
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
configure.in
View file

@ -245,9 +245,6 @@ if test "x$HAS_SVGA" != xno; then
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $SVGA_CFLAGS" CPPFLAGS="$CPPFLAGS $SVGA_CFLAGS"
AC_CHECK_HEADER(vga.h, HAS_SVGA=yes, HAS_SVGA=no) AC_CHECK_HEADER(vga.h, HAS_SVGA=yes, HAS_SVGA=no)
if test "x$HAS_SVGA" != xyes; then
HAS_TDFXGL=no
fi
CPPFLAGS="$save_CPPFLAGS" CPPFLAGS="$save_CPPFLAGS"
fi fi
@ -449,36 +446,46 @@ fi
dnl Check for xil dnl Check for xil
AC_CHECK_LIB(xil,xil_import, HAS_XIL=yes, HAS_XIL=no) AC_CHECK_LIB(xil,xil_import, HAS_XIL=yes, HAS_XIL=no)
# 3Dfx stuff..
# First we see if we can use mesa with glide support..
# if not then try the MiniGL..
TDFXGL_CFLAGS="" TDFXGL_CFLAGS=""
TDFXGL_LIBS="" TDFXGL_LIBS=""
TDFXGL_NAME="" TDFXGL_NAME=""
AC_ARG_WITH(3dfxgl, AC_ARG_WITH(3dfx, [--with-3dfx Support 3Dfx output for the V1/V2, if a argument is specified it will be used as the GL wrapper lib for glide.],
[ --with-3dfxgl=DIR use 3Dfx MiniGL library found in DIR], HAS_3dfx=$withval, HAS_3dfx=auto)
HAS_TDFXGL=$withval, HAS_TDFXGL=auto) AC_MSG_CHECKING(for 3Dfx support)
AC_ARG_WITH(3dfxgl-name, if test "x$HAS_3dfx" != xno; then
[ --with-3dfxgl-name=NAME if test "x$HAS_3dfx" != xauto; then
use -lNAME instead of -l3dfxgl], TDFXGL_NAME="$HAS_3dfx"
TDFXGL_NAME=$withval, TDFXGL_NAME=3dfxgl)
if test "x$HAS_TDFXGL" != xno; then
if test "x$HAS_TDFXGL" != xauto; then
TDFXGL_LIBS="-L$withval"
fi fi
if test "x$HAS_GLIDE" != x; then if test -n "$HAS_GLIDE"; then
if test "x$HAS_OGL" != x; then if test -n "$HAS_SVGA"; then
if test "x$HAS_SVGA" != x; then if test -z "$TDFXGL_NAME"; then
AC_CHECK_LIB($TDFXGL_NAME, glColor4f, if test -n "$HAS_FXMESA"; then
HAS_TDFXGL=yes, HAS_TDFXGL=no, [$GLIDE_LIBS $TDFXGL_LIBS]) TDFXGL_NAME=MesaGL
fi
fi
if test -z "$TDFXGL_NAME"; then
AC_CHECK_LIB("3dfxgl", glColor4f,
TDFXGL_NAME=3dfxgl, TDFXGL_NAME=,
[$GLIDE_LIBS $TDFXGL_LIBS])
fi fi
fi fi
fi fi
fi fi
if test "x$HAS_TDFXGL" = xyes; then if test -n "$TDFXGL_NAME"; then
TDFXGL_CFLAGS="$GLIDE_CFLAGS" TDFXGL_CFLAGS="$GLIDE_CFLAGS"
TDFXGL_LIBS="$TDFXGL_LIBS $GLIDE_LIBS -l$TDFXGL_NAME" TDFXGL_LIBS="$TDFXGL_LIBS $GLIDE_LIBS -l$TDFXGL_NAME"
HAS_TDFXGL="yes"
AC_MSG_RESULT(yes (using $TDFXGL_NAME))
else else
TDFXGL_NAME="" TDFXGL_NAME=""
TDFXGL_LIBS="" TDFXGL_LIBS=""
HAS_TDFXGL="no" HAS_TDFXGL="no"
AC_MSG_RESULT(no)
fi fi