From 2fe98e9fa45fec2d22ef649d8df7d02b9e065e97 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Thu, 10 May 2001 02:29:38 +0000 Subject: [PATCH] More merging. Become one with the shoggoth. Poor hungry shoggoth... --- include/buildnum.h | 34 ++++++++++++++++++++++++++++++++++ qw/include/Makefile.am | 2 +- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 include/buildnum.h diff --git a/include/buildnum.h b/include/buildnum.h new file mode 100644 index 000000000..4721742a8 --- /dev/null +++ b/include/buildnum.h @@ -0,0 +1,34 @@ +/* + buildnum.h + + Build number calculation + + Copyright (C) 1996-1997 Id Software, Inc. + + 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 _BUILDNUM_H +#define _BUILDNUM_H + +int build_number( void ); + +#endif // _BUILDNUM_H diff --git a/qw/include/Makefile.am b/qw/include/Makefile.am index 3f3e0cc77..e80586d40 100644 --- a/qw/include/Makefile.am +++ b/qw/include/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS= foreign -EXTRA_DIST = bothdefs.h buildnum.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \ +EXTRA_DIST = bothdefs.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \ cl_main.h cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h \ commdef.h d_iface.h d_ifacea.h d_local.h game.h host.h \ logos.h modelgen.h msg_ucmd.h net.h pmove.h progdefs.h \