- Applied patch from Ulrich 'Q' Spoerlein to fix build

problems on FreeBSD.
This commit is contained in:
Jamie Wilkinson 2002-10-09 21:15:53 +00:00
parent 263c46a443
commit 2e808bd20e
3 changed files with 10 additions and 3 deletions

2
THANKS
View file

@ -24,4 +24,4 @@ Faried Nawaz <fn@hungry.org>
'RvB' <hansmaulwurf@blinkenlights.ch>
Victor Shkamerda <vvs@auto.bnm.org>
Jeff Teunissen <deek@quakeforge.net>
Ulrich 'Q' Spoerlein <q@uni.de>
Ulrich 'Q' Spoerlein <q@galgenberg.net>

View file

@ -158,7 +158,14 @@ if test "x$HAVE_OPENGL" != xno; then
AC_CHECK_LIB(GL, glBegin,
OPENGL_LIBS="$OPENGL_LIBS -lGL"
HAVE_OPENGL=yes,
HAVE_OPENGL=no,
dnl add -lX11 and -lXext on FreeBSD if the first
dnl test failed
AC_CHECK_LIB(GL, glBegin,
OPENGL_LIBS="$OPENGL_LIBS -lX11 -lXext"
HAVE_OPENGL=yes,
HAVE_OPENGL=no,
[$OPENGL_LIBS]
),
[$OPENGL_LIBS]
)
fi

View file

@ -86,7 +86,7 @@ endif
# ref_tdfx
if BUILD_TDFX
ref_tdfx_la_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@
ref_tdfx_la_CFLAGS = $(std_cflags) -fPIC @SVGALIB_CFLAGS@ @OPENGL_CFLAGS@
ref_tdfx_la_LIBADD = @SVGALIB_LIBS@
ref_tdfx_la_LDFLAGS = $(module_ldflags)
endif