qf/nuq
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/nuq synced 2024-11-21 19:51:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

The end of newstyle in nuq forever!

Browse source
This commit is contained in:
Joseph Carter 2001-05-22 14:39:46 +00:00
parent 5296fb9667
commit 1911b98020
6 changed files with 10 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
SUBDIRS = include source doc RPM
SUBDIRS = include source RPM
EXTRA_DIST = tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \

6
acconfig.h
View file

@ -13,9 +13,6 @@
/* Define this to the QSG standard version you support */
#undef QSG_VERSION
/* Define if you want to use QF-style defaults instead of Id-style */
#undef NEWSTYLE
/* Define this to the location of the global config file */
#undef FS_GLOBALCFG
@ -25,9 +22,6 @@
/* Define this to the unshared game directory root */
#undef FS_USERPATH
/* Define this to the base game for the engine to load */
#undef BASEGAME
/* Define this if you want to use Intel assembly optimizations */
#undef USE_INTEL_ASM

29
configure.in
View file

@ -848,30 +848,15 @@ dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
AC_ARG_WITH(newstyle,
[ --with-newstyle compile with defaults a bit different than those
used by Id Software (does not affect gameplay)],
newstyle=$withval, newstyle=auto
)
AC_MSG_CHECKING([configuration style])
if test "x$newstyle" = xyes -o "x$newstyle" = "x"; then
AC_MSG_RESULT([new style])
AC_DEFINE(NEWSTYLE)
AC_DEFINE(BASEGAME, "base")
default_globalconf="/etc/$PACKAGE.conf"
eval foo="$datadir"
default_sharepath="$foo/games/quakeforge"
default_userpath="~/.quakeforge"
else
AC_MSG_RESULT([old style (id Software defaults)])
AC_DEFINE(BASEGAME, "id1")
if test "x$SYSTYPE" = xWIN32; then
default_globalconf="%WINDIR%/$PACKAGE.conf"
else
default_globalconf="/etc/$PACKAGE.conf"
fi
if test "x$SYSTYPE" = xWIN32; then
default_globalconf="~/${PACKAGE}.conf"
default_sharepath="."
default_userpath="."
else
default_globalconf="/etc/${PACKAGE}.conf"
eval foo="$datadir"
default_sharepath="$foo/games/$PACKAGE"
default_userpath="~/.$PACKAGE"
fi
AC_ARG_WITH(global-cfg,

10
include/win32/bc/config.h
View file

@ -65,16 +65,6 @@
/* Version strings */
#include "version.h"
/* Define if you want to use QF-style defaults instead of Id-style */
#undef NEWSTYLE
/* Define this to the subdirectory name of the default game */
#ifdef NEWSTYLE
# define BASEGAME "base"
#else
# define BASEGAME "id1"
#endif
/* Define if you have the XFree86 DGA extension */
#undef HAVE_DGA

7
include/win32/vc/config.h
View file

@ -66,14 +66,9 @@
#include "..\version.h"
/* Define if you want to use QF-style defaults instead of Id-style */
#undef NEWSTYLE
/* Define this to the subdirectory name of the default game */
#ifdef NEWSTYLE
# define BASEGAME "base"
#else
# define BASEGAME "id1"
#endif
#define BASEGAME "id1"
/* Define if you have the XFree86 DGA extension */
#undef HAVE_DGA

2
source/quakefs.c
View file

@ -930,7 +930,7 @@ COM_InitFilesystem ( void )
"location of shared (read only) game directories");
fs_userpath = Cvar_Get ("fs_userpath", FS_USERPATH, CVAR_ROM,
"location of your game directories");
fs_basegame = Cvar_Get ("fs_basegame", BASEGAME, CVAR_ROM,
fs_basegame = Cvar_Get ("fs_basegame", "id1", CVAR_ROM,
"game to use by default");
/*