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

Made the Makefile checks ifeq(VAR,yes) rather than ifneq(VAR,) to make

Browse source 
things more robust.  Fixed HAS_TDFX in configure.in for real this time.
This commit is contained in:
Joseph Carter 1999-12-30 16:08:34 +00:00
parent 120e2e9252
commit 37dab64154
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure vendored
View file

@ -2499,7 +2499,7 @@ fi
if test "x$HAS_TDFXGL" = xyes; then if test "x$HAS_TDFXGL" = xyes; then
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl" TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
else else
HAVE_TDFXGL="no" HAS_TDFXGL="no"
fi fi
fi fi
fi fi

14
configure.in
View file

@ -199,14 +199,14 @@ if test "x$HAS_TDFXGL" != xno; then
LIBS="$TDFXGL_LDFLAGS $LIBS" LIBS="$TDFXGL_LDFLAGS $LIBS"
AC_CHECK_LIB(3dfxgl, glColor4f, HAS_TDFXGL=yes, HAS_TDFXGL=) AC_CHECK_LIB(3dfxgl, glColor4f, HAS_TDFXGL=yes, HAS_TDFXGL=)
LIBS="$save_LIBS" LIBS="$save_LIBS"
if test "x$HAS_TDFXGL" = xyes; then fi
fi
fi
fi
if test "x$HAS_TDFXGL" = xyes; then
TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl" TDFXGL_LDFLAGS="$TDFXGL_LDFLAGS -l3dfxgl"
else else
HAVE_TDFXGL="no" HAS_TDFXGL="no"
fi
fi
fi
fi
fi fi
AC_SUBST(HAS_TDFXGL) AC_SUBST(HAS_TDFXGL)
AC_SUBST(TDFXGL_LDFLAGS) AC_SUBST(TDFXGL_LDFLAGS)

8
qw_client/Makefile.in
View file

@ -45,19 +45,19 @@ BIN_PREFIX = qw-client
# Client targets # Client targets
# #
ifneq ($(HAS_OGL),) ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl GLQUAKE =$(BIN_PREFIX)-gl
endif endif
ifneq ($(HAS_TDFXGL),) ifeq ($(HAS_TDFXGL),yes)
TDFXQUAKE= $(BIN_PREFIX)-3dfx TDFXQUAKE= $(BIN_PREFIX)-3dfx
endif endif
ifneq ($(HAS_X11),) ifeq ($(HAS_X11),yes)
X11QUAKE = $(BIN_PREFIX)-x11 X11QUAKE = $(BIN_PREFIX)-x11
endif endif
ifneq ($(HAS_VGA),) ifeq ($(HAS_VGA),yes)
SVGAQUAKE = $(BIN_PREFIX)-svga SVGAQUAKE = $(BIN_PREFIX)-svga
endif endif

8
uquake/Makefile.in
View file

@ -45,19 +45,19 @@ BIN_PREFIX = quake
# Client targets # Client targets
# #
ifneq ($(HAS_OGL),) ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl GLQUAKE =$(BIN_PREFIX)-gl
endif endif
ifneq ($(HAS_TDFXGL),) ifeq ($(HAS_TDFXGL),yes)
TDFXQUAKE= $(BIN_PREFIX)-3dfx TDFXQUAKE= $(BIN_PREFIX)-3dfx
endif endif
ifneq ($(HAS_X11),) ifeq ($(HAS_X11),yes)
X11QUAKE = $(BIN_PREFIX)-x11 X11QUAKE = $(BIN_PREFIX)-x11
endif endif
ifneq ($(HAS_VGA),) ifeq ($(HAS_VGA),yes)
SVGAQUAKE = $(BIN_PREFIX)-svga SVGAQUAKE = $(BIN_PREFIX)-svga
endif endif