mirror of
https://git.code.sf.net/p/quake/newtree
synced 2024-11-21 19:51:18 +00:00
newstyle dies!
This commit is contained in:
Joseph Carter
parent
f3c2c4e868
commit
883b7ecf80
6 changed files with 9 additions and 94 deletions
|
|
@ -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
|
||||
|
||||
|
|
@ -28,12 +25,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 to the base directory for the client to download skins to */
|
||||
#undef SKINBASE
|
||||
|
||||
/* Define this to use experimental code */
|
||||
#undef _EXPERIMENTAL_
|
||||
|
||||
|
|
|
|||
34
configure.in
34
configure.in
|
|
@ -1009,37 +1009,17 @@ 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 default search directories changed.
|
||||
id1 and qw become base, and rather than looking in
|
||||
. QuakeForge will look in ~/.quakeforge/ and
|
||||
\$datadir/games/quakeforge],
|
||||
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")
|
||||
AC_DEFINE(SKINBASE, "base")
|
||||
default_globalconf="/etc/$PACKAGE.conf"
|
||||
if test "x$SYSTYPE" = xWIN32; then
|
||||
default_globalconf="~/${PACKAGE}.conf"
|
||||
default_userconf="~/${PACKAGE}rc"
|
||||
default_sharepath="."
|
||||
default_userpath="."
|
||||
else
|
||||
default_globalconf="/etc/${PACKAGE}.conf"
|
||||
default_userconf="~/.${PACKAGE}rc"
|
||||
eval foo="$datadir"
|
||||
default_sharepath="$foo/games/$PACKAGE"
|
||||
default_userpath="~/.$PACKAGE"
|
||||
else
|
||||
AC_MSG_RESULT([old style (id Software defaults)])
|
||||
AC_DEFINE(BASEGAME, "id1")
|
||||
AC_DEFINE(SKINBASE, "qw")
|
||||
if test "x$SYSTYPE" = xWIN32; then
|
||||
default_globalconf="%WINDIR%/$PACKAGE.conf"
|
||||
default_userconf=""
|
||||
else
|
||||
default_globalconf="/etc/$PACKAGE.conf"
|
||||
default_userconf=""
|
||||
fi
|
||||
default_sharepath="."
|
||||
default_userpath="."
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(global-cfg,
|
||||
|
|
|
|||
|
|
@ -65,23 +65,6 @@
|
|||
/* Version string */
|
||||
#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 this to the base directory for the client to download skins to */
|
||||
#ifdef NEWSTYLE
|
||||
# define SKINBASE "base"
|
||||
#else
|
||||
# define SKINBASE "qw"
|
||||
#endif
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
#undef HAVE_DGA
|
||||
|
||||
|
|
|
|||
|
|
@ -68,23 +68,6 @@
|
|||
/* Version string */
|
||||
#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 this to the base directory for the client to download skins to */
|
||||
#ifdef NEWSTYLE
|
||||
# define SKINBASE "base"
|
||||
#else
|
||||
# define SKINBASE "qw"
|
||||
#endif
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
#undef HAVE_DGA
|
||||
|
||||
|
|
|
|||
|
|
@ -75,23 +75,6 @@
|
|||
/* Version string */
|
||||
#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 this to the base directory for the client to download skins to */
|
||||
#ifdef NEWSTYLE
|
||||
# define SKINBASE "base"
|
||||
#else
|
||||
# define SKINBASE "qw"
|
||||
#endif
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
#undef HAVE_DGA
|
||||
|
||||
|
|
|
|||
|
|
@ -1082,15 +1082,10 @@ COM_Filesystem_Init_Cvars (void)
|
|||
"location of shared (read only) game directories");
|
||||
fs_userpath = Cvar_Get ("fs_userpath", FS_USERPATH, CVAR_ROM, NULL,
|
||||
"location of your game directories");
|
||||
fs_basegame = Cvar_Get ("fs_basegame", BASEGAME, CVAR_ROM, NULL,
|
||||
fs_basegame = Cvar_Get ("fs_basegame", "id1", CVAR_ROM, NULL,
|
||||
"game to use by default");
|
||||
#ifdef NEWSTYLE
|
||||
fs_skinbase= Cvar_Get ("fs_skinbase", fs_basegame->string, CVAR_ROM, NULL,
|
||||
fs_skinbase= Cvar_Get ("fs_skinbase", "qw", CVAR_ROM, NULL,
|
||||
"location of skins dir for downloads");
|
||||
#else
|
||||
fs_skinbase= Cvar_Get ("fs_skinbase", SKINBASE, CVAR_ROM, NULL,
|
||||
"location of skins dir for downloads");
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue