mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2025-02-16 08:41:42 +00:00
autoconf support is just about complete now! the -3dfx targets build and
were tested successfully. There are a few hardwired LDFLAGS to clean up (-lm, -ldl, -lvga, and -lGL) in various targets still. In order to build with Mesa versions prior to 3.1 you'll need to change -lGL to -lMesaGL. I'll teach autoconf how to do this tonight. It's safe to come out from behind your pre_autoconf branch now guys. ;>
This commit is contained in:
Joseph Carter
parent
31cca7e205
commit
4a75740f5f
6 changed files with 146 additions and 81 deletions
142
configure
vendored
142
configure
vendored
|
|
@ -2452,15 +2452,17 @@ else
|
|||
|
||||
fi
|
||||
|
||||
if test "x$HAS_3DFXGL" != xno; then
|
||||
if test "x$HAS_3DFXGL" != xauto; then
|
||||
if test "x$HAS_TDFXGL" != xno; then
|
||||
if test "x$HAS_TDFXGL" != xauto; then
|
||||
TDFXGL_LDFLAGS="-L$withval"
|
||||
fi
|
||||
if test "x$HAS_GLIDE" != x; then
|
||||
if test "x$HAS_OGL" != x; then
|
||||
if test "x$HAS_VGA" != x; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$TDFXGL_LDFLAGS $LIBS"
|
||||
echo $ac_n "checking for glColor4f in -l3dfxgl""... $ac_c" 1>&6
|
||||
echo "configure:2464: checking for glColor4f in -l3dfxgl" >&5
|
||||
echo "configure:2466: checking for glColor4f in -l3dfxgl" >&5
|
||||
ac_lib_var=`echo 3dfxgl'_'glColor4f | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -2468,7 +2470,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-l3dfxgl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2472 "configure"
|
||||
#line 2474 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -2479,7 +2481,7 @@ int main() {
|
|||
glColor4f()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -2500,6 +2502,10 @@ else
|
|||
HAS_TDFXGL=
|
||||
fi
|
||||
|
||||
LIBS="$save_LIBS"
|
||||
if test "x$HAS_TDFXGL" = xyes; then
|
||||
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -2509,13 +2515,13 @@ fi
|
|||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
||||
echo "configure:2513: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:2519: checking whether ${CC-cc} needs -traditional" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
ac_pattern="Autoconf.*'x'"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2519 "configure"
|
||||
#line 2525 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
|
|
@ -2533,7 +2539,7 @@ rm -f conftest*
|
|||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2537 "configure"
|
||||
#line 2543 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
|
|
@ -2555,12 +2561,12 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
|
|||
fi
|
||||
|
||||
echo $ac_n "checking for stricmp""... $ac_c" 1>&6
|
||||
echo "configure:2559: checking for stricmp" >&5
|
||||
echo "configure:2565: checking for stricmp" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_stricmp'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2564 "configure"
|
||||
#line 2570 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char stricmp(); below. */
|
||||
|
|
@ -2583,7 +2589,7 @@ stricmp();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_stricmp=yes"
|
||||
else
|
||||
|
|
@ -2601,12 +2607,12 @@ if eval "test \"`echo '$ac_cv_func_'stricmp`\" = yes"; then
|
|||
else
|
||||
echo "$ac_t""no" 1>&6
|
||||
echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6
|
||||
echo "configure:2605: checking for strcasecmp" >&5
|
||||
echo "configure:2611: checking for strcasecmp" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2610 "configure"
|
||||
#line 2616 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char strcasecmp(); below. */
|
||||
|
|
@ -2629,7 +2635,7 @@ strcasecmp();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_strcasecmp=yes"
|
||||
else
|
||||
|
|
@ -2660,7 +2666,7 @@ fi
|
|||
if test "x$RELEASE" = xyes; then
|
||||
if test "x$GCC" = xyes; then
|
||||
echo $ac_n "checking for special release compiler settings""... $ac_c" 1>&6
|
||||
echo "configure:2664: checking for special release compiler settings" >&5
|
||||
echo "configure:2670: checking for special release compiler settings" >&5
|
||||
BASE_RELEASE_CFLAGS="-O6 -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations"
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
|
|
@ -2689,7 +2695,7 @@ fi
|
|||
# is it an intel box?
|
||||
#
|
||||
echo $ac_n "checking for an Intel machine""... $ac_c" 1>&6
|
||||
echo "configure:2693: checking for an Intel machine" >&5
|
||||
echo "configure:2699: checking for an Intel machine" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
INTEL_ARCH=yes
|
||||
|
|
@ -2704,7 +2710,7 @@ esac
|
|||
# CD audio available?
|
||||
#
|
||||
echo $ac_n "checking for CD audio support""... $ac_c" 1>&6
|
||||
echo "configure:2708: checking for CD audio support" >&5
|
||||
echo "configure:2714: checking for CD audio support" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
CD_AUDIO_SRC="cd_linux.c" ;;
|
||||
|
|
@ -2723,7 +2729,7 @@ fi
|
|||
# Sound available?
|
||||
#
|
||||
echo $ac_n "checking for sound support""... $ac_c" 1>&6
|
||||
echo "configure:2727: checking for sound support" >&5
|
||||
echo "configure:2733: checking for sound support" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
SND_SRC="snd_dma.c snd_linux.c snd_mixa.s" ;;
|
||||
|
|
@ -2747,7 +2753,7 @@ fi
|
|||
# System driver?
|
||||
#
|
||||
echo $ac_n "checking for system driver""... $ac_c" 1>&6
|
||||
echo "configure:2751: checking for system driver" >&5
|
||||
echo "configure:2757: checking for system driver" >&5
|
||||
case "${target}" in
|
||||
i[34567]86-*-linux-gnu*)
|
||||
SYS_SRC="sys_linux.c"
|
||||
|
|
@ -2784,7 +2790,7 @@ fi
|
|||
# If Solaris, use vid_sunx.c,
|
||||
# otherwise (if X available) use vid_x.c
|
||||
echo $ac_n "checking for X11 video driver""... $ac_c" 1>&6
|
||||
echo "configure:2788: checking for X11 video driver" >&5
|
||||
echo "configure:2794: checking for X11 video driver" >&5
|
||||
case "${target}" in
|
||||
*-solaris*)
|
||||
X11_VID_SRC="vid_sunx.c" ;;
|
||||
|
|
@ -2804,12 +2810,12 @@ fi
|
|||
|
||||
|
||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||
echo "configure:2808: checking for Cygwin environment" >&5
|
||||
echo "configure:2814: checking for Cygwin environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2813 "configure"
|
||||
#line 2819 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
|
@ -2820,7 +2826,7 @@ int main() {
|
|||
return __CYGWIN__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_cygwin=yes
|
||||
else
|
||||
|
|
@ -2837,19 +2843,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
|
|||
CYGWIN=
|
||||
test "$ac_cv_cygwin" = yes && CYGWIN=yes
|
||||
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
|
||||
echo "configure:2841: checking for mingw32 environment" >&5
|
||||
echo "configure:2847: checking for mingw32 environment" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2846 "configure"
|
||||
#line 2852 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
return __MINGW32__;
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
rm -rf conftest*
|
||||
ac_cv_mingw32=yes
|
||||
else
|
||||
|
|
@ -2868,7 +2874,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
|
|||
|
||||
|
||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||
echo "configure:2872: checking for executable suffix" >&5
|
||||
echo "configure:2878: checking for executable suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
|
|
@ -2878,7 +2884,7 @@ else
|
|||
rm -f conftest*
|
||||
echo 'int main () { return 0; }' > conftest.$ac_ext
|
||||
ac_cv_exeext=
|
||||
if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
|
||||
for file in conftest.*; do
|
||||
case $file in
|
||||
*.c | *.o | *.obj) ;;
|
||||
|
|
@ -2899,13 +2905,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6
|
|||
ac_exeext=$EXEEXT
|
||||
|
||||
echo $ac_n "checking for object suffix""... $ac_c" 1>&6
|
||||
echo "configure:2903: checking for object suffix" >&5
|
||||
echo "configure:2909: checking for object suffix" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
rm -f conftest*
|
||||
echo 'int i = 1;' > conftest.$ac_ext
|
||||
if { (eval echo configure:2909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
if { (eval echo configure:2915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||
for ac_file in conftest.*; do
|
||||
case $ac_file in
|
||||
*.c) ;;
|
||||
|
|
@ -2942,17 +2948,17 @@ else
|
|||
case "`(uname -sr) 2>/dev/null`" in
|
||||
"SunOS 5"*)
|
||||
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
|
||||
echo "configure:2946: checking whether -R must be followed by a space" >&5
|
||||
echo "configure:2952: checking whether -R must be followed by a space" >&5
|
||||
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2949 "configure"
|
||||
#line 2955 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_nospace=yes
|
||||
else
|
||||
|
|
@ -2968,14 +2974,14 @@ rm -f conftest*
|
|||
else
|
||||
LIBS="$ac_xsave_LIBS -R $x_libraries"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 2972 "configure"
|
||||
#line 2978 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
int main() {
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:2985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
ac_R_space=yes
|
||||
else
|
||||
|
|
@ -3007,7 +3013,7 @@ rm -f conftest*
|
|||
# libraries were built with DECnet support. And karl@cs.umb.edu says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
|
||||
echo "configure:3011: checking for dnet_ntoa in -ldnet" >&5
|
||||
echo "configure:3017: checking for dnet_ntoa in -ldnet" >&5
|
||||
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3015,7 +3021,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3019 "configure"
|
||||
#line 3025 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3026,7 +3032,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3048,7 +3054,7 @@ fi
|
|||
|
||||
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
|
||||
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
|
||||
echo "configure:3052: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
echo "configure:3058: checking for dnet_ntoa in -ldnet_stub" >&5
|
||||
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3056,7 +3062,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldnet_stub $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3060 "configure"
|
||||
#line 3066 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3067,7 +3073,7 @@ int main() {
|
|||
dnet_ntoa()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3096,12 +3102,12 @@ fi
|
|||
# The nsl library prevents programs from opening the X display
|
||||
# on Irix 5.2, according to dickey@clark.net.
|
||||
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
|
||||
echo "configure:3100: checking for gethostbyname" >&5
|
||||
echo "configure:3106: checking for gethostbyname" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3105 "configure"
|
||||
#line 3111 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char gethostbyname(); below. */
|
||||
|
|
@ -3124,7 +3130,7 @@ gethostbyname();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_gethostbyname=yes"
|
||||
else
|
||||
|
|
@ -3145,7 +3151,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_gethostbyname = no; then
|
||||
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
|
||||
echo "configure:3149: checking for gethostbyname in -lnsl" >&5
|
||||
echo "configure:3155: checking for gethostbyname in -lnsl" >&5
|
||||
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3153,7 +3159,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lnsl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3157 "configure"
|
||||
#line 3163 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3164,7 +3170,7 @@ int main() {
|
|||
gethostbyname()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3194,12 +3200,12 @@ fi
|
|||
# -lsocket must be given before -lnsl if both are needed.
|
||||
# We assume that if connect needs -lnsl, so does gethostbyname.
|
||||
echo $ac_n "checking for connect""... $ac_c" 1>&6
|
||||
echo "configure:3198: checking for connect" >&5
|
||||
echo "configure:3204: checking for connect" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3203 "configure"
|
||||
#line 3209 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char connect(); below. */
|
||||
|
|
@ -3222,7 +3228,7 @@ connect();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_connect=yes"
|
||||
else
|
||||
|
|
@ -3243,7 +3249,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_connect = no; then
|
||||
echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
|
||||
echo "configure:3247: checking for connect in -lsocket" >&5
|
||||
echo "configure:3253: checking for connect in -lsocket" >&5
|
||||
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3251,7 +3257,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3255 "configure"
|
||||
#line 3261 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3262,7 +3268,7 @@ int main() {
|
|||
connect()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3286,12 +3292,12 @@ fi
|
|||
|
||||
# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
|
||||
echo $ac_n "checking for remove""... $ac_c" 1>&6
|
||||
echo "configure:3290: checking for remove" >&5
|
||||
echo "configure:3296: checking for remove" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3295 "configure"
|
||||
#line 3301 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char remove(); below. */
|
||||
|
|
@ -3314,7 +3320,7 @@ remove();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_remove=yes"
|
||||
else
|
||||
|
|
@ -3335,7 +3341,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_remove = no; then
|
||||
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
|
||||
echo "configure:3339: checking for remove in -lposix" >&5
|
||||
echo "configure:3345: checking for remove in -lposix" >&5
|
||||
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3343,7 +3349,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lposix $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3347 "configure"
|
||||
#line 3353 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3354,7 +3360,7 @@ int main() {
|
|||
remove()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3378,12 +3384,12 @@ fi
|
|||
|
||||
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
|
||||
echo $ac_n "checking for shmat""... $ac_c" 1>&6
|
||||
echo "configure:3382: checking for shmat" >&5
|
||||
echo "configure:3388: checking for shmat" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3387 "configure"
|
||||
#line 3393 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char shmat(); below. */
|
||||
|
|
@ -3406,7 +3412,7 @@ shmat();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_shmat=yes"
|
||||
else
|
||||
|
|
@ -3427,7 +3433,7 @@ fi
|
|||
|
||||
if test $ac_cv_func_shmat = no; then
|
||||
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
|
||||
echo "configure:3431: checking for shmat in -lipc" >&5
|
||||
echo "configure:3437: checking for shmat in -lipc" >&5
|
||||
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3435,7 +3441,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lipc $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3439 "configure"
|
||||
#line 3445 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3446,7 +3452,7 @@ int main() {
|
|||
shmat()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
@ -3479,7 +3485,7 @@ fi
|
|||
# libraries we check for below, so use a different variable.
|
||||
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
|
||||
echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
|
||||
echo "configure:3483: checking for IceConnectionNumber in -lICE" >&5
|
||||
echo "configure:3489: checking for IceConnectionNumber in -lICE" >&5
|
||||
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
|
|
@ -3487,7 +3493,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-lICE $X_EXTRA_LIBS $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 3491 "configure"
|
||||
#line 3497 "configure"
|
||||
#include "confdefs.h"
|
||||
/* Override any gcc2 internal prototype to avoid an error. */
|
||||
/* We use char because int might match the return type of a gcc2
|
||||
|
|
@ -3498,7 +3504,7 @@ int main() {
|
|||
IceConnectionNumber()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:3502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:3508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||
else
|
||||
|
|
|
|||
10
configure.in
10
configure.in
|
|
@ -192,15 +192,21 @@ AC_ARG_ENABLE(3dfxgl,
|
|||
[ --enable-3dfxgl=DIR Use lib3dfxgl.so found in DIR],
|
||||
HAS_TDFXGL=$withval, HAS_TDFXGL=auto
|
||||
)
|
||||
if test "x$HAS_3DFXGL" != xno; then
|
||||
if test "x$HAS_3DFXGL" != xauto; then
|
||||
if test "x$HAS_TDFXGL" != xno; then
|
||||
if test "x$HAS_TDFXGL" != xauto; then
|
||||
TDFXGL_LDFLAGS="-L$withval"
|
||||
fi
|
||||
dnl FIX: is it safe to assume test has -o ?
|
||||
if test "x$HAS_GLIDE" != x; then
|
||||
if test "x$HAS_OGL" != x; then
|
||||
if test "x$HAS_VGA" != x; then
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="$TDFXGL_LDFLAGS $LIBS"
|
||||
AC_CHECK_LIB(3dfxgl, glColor4f, HAS_TDFXGL=yes, HAS_TDFXGL=)
|
||||
LIBS="$save_LIBS"
|
||||
if test "x$HAS_TDFXGL" = xyes; then
|
||||
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
11
pre.in
11
pre.in
|
|
@ -12,11 +12,12 @@ ifneq ($(SRC_DIR),.)
|
|||
SRC_DIR_INC = -I$(SRC_DIR)
|
||||
endif
|
||||
|
||||
HAS_VGA = @HAS_VGA@
|
||||
HAS_GLIDE= @HAS_GLIDE@
|
||||
HAS_OGL = @HAS_OGL@
|
||||
HAS_XIL = @HAS_XIL@
|
||||
HAS_X11 = @HAS_X11@
|
||||
HAS_VGA = @HAS_VGA@
|
||||
HAS_GLIDE = @HAS_GLIDE@
|
||||
HAS_TDFXGL = @HAS_TDFXGL@
|
||||
HAS_OGL = @HAS_OGL@
|
||||
HAS_XIL = @HAS_XIL@
|
||||
HAS_X11 = @HAS_X11@
|
||||
|
||||
MAKE_SURE_DIR = if test -d "$(BUILD_DIR)/$$DIR"; \
|
||||
then \
|
||||
|
|
|
|||
|
|
@ -27,8 +27,9 @@ BIN_PREFIX = qw-client
|
|||
#
|
||||
DEFS = @DEFS@ @STRICMP_DEF@
|
||||
CFLAGS = -DQUAKEWORLD $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(QW_COMMON_DIR) -I$(COMMON_DIR)
|
||||
ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(QW_X11_VID_SRC) model.c
|
||||
ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC) $(QW_GL_REND_SRC)
|
||||
ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(QW_X11_VID_SRC) model.c
|
||||
ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC) $(QW_GL_REND_SRC)
|
||||
ALL_TDFX_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(TDFX_VID_SRC) $(QW_GL_REND_SRC)
|
||||
|
||||
GENERAL_SRC = $(CL_COMMON_SRC) \
|
||||
$(QW_CL_SRC) $(QW_NET_SRC) net_chan.c skin.c \
|
||||
|
|
|
|||
50
rules.in
50
rules.in
|
|
@ -152,3 +152,53 @@ clean-$(GLQUAKE):
|
|||
rm -f $(OBJSquake-gl)
|
||||
endif
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
# quake-3dfx
|
||||
#
|
||||
ifneq ($(TDFXQUAKE),)
|
||||
OBJSquake-3dfx = $(patsubst %,$(BUILD_DIR)/3dfx/%,$(addsuffix .@OBJEXT@, $(basename $(ALL_TDFX_SRC) .c .s)))
|
||||
|
||||
TDFX_CFLAGS = -DGLQUAKE @OGL_CFLAGS@ @GLIDE_CFLAGS@
|
||||
TDFX_LDFLAGS = $(SVGA_LDFLAGS) @GLIDE_LDFLAGS@ @TDFXGL_LDFLAGS@ -ldl
|
||||
# XXX - this is for 3dfxgl
|
||||
TDFX_VID_SRC = gl_vidlinux.c
|
||||
|
||||
# This can be thought of as a macro that makes sure that the x11
|
||||
# sub-directory is created
|
||||
# XXX - can we avoid doing every compile?
|
||||
MAKE_SURE_3dfx_DIR = @DIR=3dfx; $(MAKE_SURE_DIR)
|
||||
|
||||
$(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.c
|
||||
$(MAKE_SURE_3dfx_DIR)
|
||||
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
|
||||
|
||||
$(BUILD_DIR)/3dfx/%.o: $(SRC_DIR)/%.s
|
||||
$(MAKE_SURE_3dfx_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.c
|
||||
$(MAKE_SURE_3dfx_DIR)
|
||||
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
|
||||
|
||||
ifneq ($(QW_COMMON_DIR),)
|
||||
$(BUILD_DIR)/3dfx/%.o: $(QW_COMMON_DIR)/%.c
|
||||
$(MAKE_SURE_3dfx_DIR)
|
||||
$(CC) $(CFLAGS) $(TDFX_CFLAGS) -o $@ -c $<
|
||||
endif
|
||||
|
||||
$(BUILD_DIR)/3dfx/%.o: $(COMMON_DIR)/%.s
|
||||
$(MAKE_SURE_gl_DIR)
|
||||
$(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
|
||||
|
||||
$(TDFXQUAKE): $(BUILD_DIR)/bin/$(TDFXQUAKE)
|
||||
|
||||
$(BUILD_DIR)/bin/$(TDFXQUAKE): $(OBJSquake-3dfx)
|
||||
$(MAKE_SURE_bin_DIR)
|
||||
$(CC) $(CFLAGS) $(OBJSquake-3dfx) $(TDFX_LDFLAGS) $(LDFLAGS) -o $(BUILD_DIR)/bin/$(TDFXQUAKE)
|
||||
|
||||
# XXX - Can this be automated?
|
||||
clean-$(TDFXQUAKE):
|
||||
rm -f $(OBJSquake-3dfx)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -25,10 +25,11 @@ BIN_PREFIX = quake
|
|||
#
|
||||
# Directory specific stuff
|
||||
#
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_DIR) -I$(UQ_DIR)/include
|
||||
ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(X11_VID_SRC) model.c
|
||||
ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC)
|
||||
DEFS = @DEFS@
|
||||
CFLAGS = $(OPTFLAGS) $(DEFS) -I. $(SRC_DIR_INC) -I$(COMMON_DIR) -I$(UQ_DIR)/include
|
||||
ALL_X11_SRC = $(GENERAL_SRC) $(SW_REND_SRC) $(X11_VID_SRC) model.c
|
||||
ALL_GL_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(GL_VID_SRC)
|
||||
ALL_TDFX_SRC = $(GENERAL_SRC) $(GL_REND_SRC) $(TDFX_VID_SRC)
|
||||
|
||||
GENERAL_SRC = $(CL_COMMON_SRC) \
|
||||
$(SYS_SRC) chase.c world.c $(SRV_PR_SRC) \
|
||||
|
|
|
|||
Loading…
Reference in a new issue