From 0f80fb559fdaea381dc87dc829aaf7db957e1502 Mon Sep 17 00:00:00 2001 From: Joseph Carter Date: Mon, 17 Jan 2000 02:53:39 +0000 Subject: [PATCH] Added --enable-newstyle to configure which will define NEWSTYLE. This is only to be used for changes to defaults which do not affect gameplay such as where we look for pak files by default. --- acconfig.h | 5 ++++- configure.in | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/acconfig.h b/acconfig.h index eb4cd1f..16d5676 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,7 +1,10 @@ -/* Version string */ +/* Version strings */ #undef QF_VERSION #undef VERSION +/* Define if you want to use QF-style defaults instead of Id-style */ +#undef NEWSTYLE + /* Define if you have the XFree86 DGA extension */ #undef HAS_DGA diff --git a/configure.in b/configure.in index 50aa92b..916464c 100644 --- a/configure.in +++ b/configure.in @@ -3,9 +3,15 @@ AC_PREREQ(2.13) AC_INIT(common/crc.h) dnl Version of this release -AC_DEFINE(QF_VERSION,"0.1.0-pre") +AC_DEFINE(QF_VERSION,"0.1-pre") AC_DEFINE(VERSION,"2.40") +dnl Set to yes for releases +RELEASE=no + +dnl At some point this might be set to yes by default +NEWSTYLE=no + AC_CANONICAL_SYSTEM AC_LANG_C @@ -52,12 +58,21 @@ AC_CHECK_FUNCS(gethostname gethostbyname connect gettimeofday getwd mkdir \ ftime _ftime fcntl stat putenv select socket strerror strstr \ snprintf _snprintf vsnprintf _vsnprintf) +NEWSTYLE=no +AC_ARG_ENABLE(newstyle, +[ --enable-newstyle compile with defaults a bit different than those + used by Id Software (does not affect gameplay)], + NEWSTYLE=$enable_newstyle +) +if test "x$NEWSTYLE" = xyes; then + AC_DEFINE(NEWSTYLE) +fi + AC_ARG_ENABLE(release, [ --enable-release compile release (with optimization)], RELEASE=$enable_release ) -dnl FIXME: Remove next line when ALSA support is added AC_ARG_ENABLE(alsa, [ --enable-alsa enable alsa support], )