mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-05-30 16:50:48 +00:00
Configuration stuff. include/win32/version.h is now Autoconfiscated (but
still has to be in CVS, because Win32 people generally won't be able to rebuild it). configure.in: Cleanups to the DGA, VidMode, and sound detection code. Makefile.am: Cleanups to sound code, to allow 'make dist' to work.
This commit is contained in:
Jeff Teunissen
parent
069fb0eead
commit
2d0932e00e
6 changed files with 234 additions and 177 deletions
|
|
@ -1,14 +1,14 @@
|
|||
/*
|
||||
config.h
|
||||
|
||||
Configuration for Borland C++. This file would have been
|
||||
Configuration for Borland C++. This file would have been
|
||||
autogenerated by configure, for any sane compiler.
|
||||
|
||||
Copyright (C) 2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
||||
Author: Jukka Sorjonen
|
||||
Date: 19 May 2000
|
||||
Author: Jukka Sorjonen
|
||||
Date: 19 May 2000
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
59 Temple Place - Suite 330
|
||||
Boston, MA 02111-1307, USA
|
||||
|
||||
$Id$
|
||||
*/
|
||||
|
||||
#ifndef _CONFIG_H
|
||||
|
|
@ -62,28 +63,16 @@
|
|||
#define X_DISPLAY_MISSING
|
||||
|
||||
/* Version string */
|
||||
/* these are included by version.h
|
||||
#define QW_VERSION "2.40"
|
||||
#define VERSION "0.1.99pre0"
|
||||
#define PROGRAM "QuakeForge"
|
||||
#define PACKAGE "quakeforge"
|
||||
*/
|
||||
#include "version.h"
|
||||
|
||||
/* Define if you want to use QF-style defaults instead of Id-style */
|
||||
#undef NEWSTYLE
|
||||
|
||||
#ifdef NEWSTYLE
|
||||
#define BASEGAME "base"
|
||||
#else
|
||||
#define BASEGAME "id1"
|
||||
#endif
|
||||
|
||||
/* Define this to the subdirectory name of the default game */
|
||||
#ifdef NEWSTYLE
|
||||
# define GAMENAME "base"
|
||||
# define BASEGAME "base"
|
||||
#else
|
||||
# define GAMENAME "id1"
|
||||
# define BASEGAME "id1"
|
||||
#endif
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
|
|
@ -179,6 +168,9 @@
|
|||
/* Define if you have the <fcntl.h> header file. */
|
||||
#define HAVE_FCNTL_H 1
|
||||
|
||||
/* Define if you have the <fnmatch.h> header file. */
|
||||
#undef HAVE_FNMATCH_H
|
||||
|
||||
/* Define if you have the <initguid.h> header file. */
|
||||
#define HAVE_INITGUID_H 1
|
||||
|
||||
|
|
@ -252,10 +244,7 @@
|
|||
#undef HAVE_LIBM
|
||||
|
||||
/* Define if you want the QSG standards */
|
||||
#define QSG_VERSION "1"
|
||||
|
||||
/* Define the name of the global config file */
|
||||
#define GLOBAL_CFG_FILE ".\\qforge.cfg"
|
||||
#define QSG_VERSION "1.0"
|
||||
|
||||
/* Posix, needed for limits.h and Unix stuffs to work right */
|
||||
#define _POSIX_
|
||||
|
|
@ -266,9 +255,10 @@
|
|||
/* Dir used for shared game data */
|
||||
#define FS_SHAREPATH "."
|
||||
|
||||
/* Dir used for shared game data */
|
||||
/* Dir used for unshared (user) game data */
|
||||
#define FS_USERPATH "."
|
||||
|
||||
/* Location of QuakeForge's global config file */
|
||||
#define FS_GLOBALCFG ".\\global.cfg"
|
||||
|
||||
#define strcasecmp(s1, s2) stricmp((s1), (s2))
|
||||
|
|
@ -297,4 +287,4 @@
|
|||
# define tan _tan
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif // _CONFIG_H
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@
|
|||
$Id$
|
||||
*/
|
||||
|
||||
/* common/config.h.in. Generated automatically from configure.in by autoheader. */
|
||||
|
||||
#ifndef _CONFIG_H
|
||||
#define _CONFIG_H
|
||||
|
||||
|
|
@ -65,28 +63,16 @@
|
|||
#define X_DISPLAY_MISSING
|
||||
|
||||
/* Version string */
|
||||
/* these are included from version.h
|
||||
#define QW_VERSION "2.40"
|
||||
#define VERSION "0.2.0"
|
||||
#define PROGRAM "QuakeForge"
|
||||
#define PACKAGE "quakeforge"
|
||||
*/
|
||||
#include "version.h"
|
||||
|
||||
/* Define if you want to use QF-style defaults instead of Id-style */
|
||||
#undef NEWSTYLE
|
||||
|
||||
#ifdef NEWSTYLE
|
||||
#define BASEGAME "base"
|
||||
#else
|
||||
#define BASEGAME "id1"
|
||||
#endif
|
||||
|
||||
/* Define this to the subdirectory name of the default game */
|
||||
#ifdef NEWSTYLE
|
||||
# define GAMENAME "base"
|
||||
# define BASEGAME "base"
|
||||
#else
|
||||
# define GAMENAME "id1"
|
||||
# define BASEGAME "id1"
|
||||
#endif
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
|
|
@ -183,7 +169,7 @@
|
|||
#undef HAVE_FCNTL_H
|
||||
|
||||
/* Define if you have the <fnmatch.h> header file. */
|
||||
#define HAVE_FNMATCH_H
|
||||
#define HAVE_FNMATCH_H 1
|
||||
|
||||
/* Define if you have the <initguid.h> header file. */
|
||||
#undef HAVE_INITGUID_H
|
||||
|
|
@ -258,10 +244,7 @@
|
|||
#undef HAVE_LIBM
|
||||
|
||||
/* Define if you want the QSG standards */
|
||||
#define QSG_VERSION "1"
|
||||
|
||||
/* Define the name of the global config file */
|
||||
#define GLOBAL_CFG_FILE ".\\qforge.cfg"
|
||||
#define QSG_VERSION "1.0"
|
||||
|
||||
/* Posix, needed for limits.h and Unix stuffs to work right */
|
||||
#define _POSIX_
|
||||
|
|
@ -269,10 +252,15 @@
|
|||
/* Define if we've scitech MGL library and mgraph.h */
|
||||
#define HAVE_MGRAPH_H 1
|
||||
|
||||
#define FS_GLOBALCFG ".\\global.cfg"
|
||||
/* Dir used for shared game data */
|
||||
#define FS_SHAREPATH "."
|
||||
|
||||
/* Dir used for unshared (user) game data */
|
||||
#define FS_USERPATH "."
|
||||
|
||||
/* Location of QuakeForge's global config file */
|
||||
#define FS_GLOBALCFG ".\\global.cfg"
|
||||
|
||||
#define strcasecmp(s1, s2) stricmp((s1), (s2))
|
||||
#define strncasecmp(s1, s2, n) strnicmp((s1), (s2), (n))
|
||||
|
||||
|
|
@ -299,4 +287,4 @@
|
|||
# define tan _tan
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif // _CONFIG_H
|
||||
|
|
|
|||
|
|
@ -33,10 +33,11 @@
|
|||
#ifndef _VERSION_H
|
||||
#define _VERSION_H
|
||||
|
||||
/* Version string */
|
||||
#define QW_VERSION "2.40"
|
||||
#define VERSION "0.1.99pre2"
|
||||
#define PROGRAM "QuakeForge"
|
||||
#define PACKAGE "quakeforge"
|
||||
/* Version strings */
|
||||
#define PACKAGE "quakeforge"
|
||||
#define PROGRAM "QuakeForge"
|
||||
#define VERSION "0.1.99pre2"
|
||||
#define QW_VERSION "2.40"
|
||||
#define QSG_VERSION "1.0"
|
||||
|
||||
#endif /* _VERSION_H_ */
|
||||
#endif // _VERSION_H
|
||||
|
|
|
|||
43
include/win32/version.h.in
Normal file
43
include/win32/version.h.in
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
/*
|
||||
version.h
|
||||
|
||||
version numbers for the win32 builds that don't use autoconf
|
||||
|
||||
Copyright (C) 2000 contributors of the QuakeForge project
|
||||
Please see the file "AUTHORS" for a list of contributors
|
||||
|
||||
Author: Thad Ward
|
||||
Date: 22 May 2000
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
as published by the Free Software Foundation; either version 2
|
||||
of the License, or (at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to:
|
||||
|
||||
Free Software Foundation, Inc.
|
||||
59 Temple Place - Suite 330
|
||||
Boston, MA 02111-1307, USA
|
||||
|
||||
$Id$
|
||||
*/
|
||||
|
||||
#ifndef _VERSION_H
|
||||
#define _VERSION_H
|
||||
|
||||
/* Version strings */
|
||||
#define PACKAGE "@PACKAGE@"
|
||||
#define PROGRAM "@PROGRAM@"
|
||||
#define VERSION "@VERSION@"
|
||||
#define QW_VERSION "@QW_VERSION@"
|
||||
#define QSG_VERSION "@QSG_VERSION@"
|
||||
|
||||
#endif // _VERSION_H
|
||||
Loading…
Add table
Add a link
Reference in a new issue