qf/quake2forge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quake2forge synced 2024-12-12 05:32:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

* bootstrap tries to detect if you have gmake instead of

Browse source 
make for bsd systems
* cleaned out the header file checks in configure, now add
  them as they're needed
* check for sys/vt.h in src/rw*svgalib.c
This commit is contained in:
Jamie Wilkinson 2002-04-09 01:49:38 +00:00
parent 41a546293a
commit 5dfca94f1c
4 changed files with 67 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrap
View file

@ -4,11 +4,20 @@
# bootstrap the build when checking out from CVS
# dodgy hack to use gmake if we're on bsd systems
if [ -x /usr/bin/gmake ]; then
MAKE=/usr/bin/gmake
elif [ -x /usr/local/bin/gmake ]; then
MAKE=/usr/local/bin/gmake
else
MAKE=make
fi
if [ "$1" = "clean" ]; then
# clean up junk
if [ -f Makefile ]; then
make distclean
$MAKE distclean
fi
find . -name Makefile.in -print0 | xargs -0 rm -f
rm -f config.h.in aclocal.m4 install-sh missing mkinstalldirs \

2
configure.in
View file

@ -49,7 +49,7 @@ AC_PATH_X
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS([arpa/inet.h errno.h fcntl.h float.h limits.h mntent.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h termios.h unistd.h])
AC_CHECK_HEADERS([sys/vt.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST

46
src/rw_in_svgalib.c
View file

@ -1,31 +1,41 @@
/*
Copyright (C) 1997-2001 Id Software, Inc.
/* $Id$
*
* Copyright (C) 1997-2001 Id Software, Inc.
* Copyright (c) 2002 The Quakeforge Project.
*
*
* 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 the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
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.
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
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 the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/vt.h>
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
#include <sys/mman.h>
#ifdef HAVE_SYS_VT_H
# include <sys/vt.h>
#endif
#include "vga.h"
#include "vgakeyboard.h"
#include "vgamouse.h"

47
src/rw_svgalib.c
View file

@ -1,22 +1,24 @@
/*
Copyright (C) 1997-2001 Id Software, Inc.
/* $Id$
*
* Copyright (C) 1997-2001 Id Software, Inc.
* Copyright (c) 2002 The Quakeforge Project.
*
* 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 the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
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 the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/*
** RW_SVGALBI.C
**
@ -32,16 +34,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
** SWimp_SwitchFullscreen
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <termios.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/vt.h>
#include <stdarg.h>
#include <stdio.h>
#include <signal.h>
#include <unistd.h>
#include <sys/mman.h>
#ifdef HAVE_SYS_VT_H
# include <sys/vt.h>
#endif
#include "vga.h"
#include "vgakeyboard.h"
#include "vgamouse.h"