qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-10 14:42:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Renamed vid_x.c -> vid_x11.c, also renamed *-gl to *-glx, it it'll cause

Browse source 
less confusion that way (even if I have to type an extra letter..)
This commit is contained in:
Joseph Carter 2000-02-13 09:06:11 +00:00
parent b5b0dcd73f
commit 1d7260195f
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/in_x11.c
View file

@ -1,5 +1,5 @@
/*
vid_x.c - general x video driver
in_x11.c - general x11 input driver
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]

28
common/vid_sunx.c
View file

@ -1,4 +1,5 @@
/*
vid_sunx.c - sun x11 video driver
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]
@ -20,10 +21,9 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// vid_x.c -- general x video driver
#define _BSD
#include "config.h"
#include <config.h>
#include <ctype.h>
#include <sys/time.h>
@ -44,18 +44,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <X11/extensions/XShm.h>
#include <errno.h>
#include "quakedef.h"
#include "d_local.h"
#include "keys.h"
#include "console.h"
#include "sound.h"
#include "cvar.h"
#include "draw.h"
#include "cmd.h"
#include "lib_replace.h"
#include "common.h"
#include "sys.h"
#include "client.h"
#include <quakedef.h>
#include <d_local.h>
#include <keys.h>
#include <console.h>
#include <sound.h>
#include <cvar.h>
#include <draw.h>
#include <cmd.h>
#include <lib_replace.h>
#include <common.h>
#include <sys.h>
#include <client.h>
cvar_t _windowed_mouse = {"_windowed_mouse","0", true};
cvar_t m_filter = {"m_filter","0", true};

2
common/vid_x.c → common/vid_x11.c
View file

@ -1,5 +1,5 @@
/*
vid_x.c - general x video driver
vid_x11.c - general x11 video driver
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999-2000 contributors of the QuakeForge project
Copyright (C) 2000 Marcus Sundberg [mackan@stacken.kth.se]

4
configure.in
View file

@ -152,7 +152,7 @@ fi
fi
dnl Checks for X11 support
dnl (XoXus: Since vid_x.c relies on XShm being there, this now disables
dnl (XoXus: Since vid_x11.c relies on XShm being there, this now disables
dnl the X11 video driver if -lXext can not be found)
AC_PATH_XTRA
if test "x$no_x" = x; then
@ -730,7 +730,7 @@ case "${target}" in
X11_VID_SRC="vid_sunx.c" ;;
*)
if test "x$HAS_X11"; then
X11_VID_SRC="vid_x.c";
X11_VID_SRC="vid_x11.c";
else
X11_VID_SRC=
fi

4
qw_client/Makefile.in
View file

@ -83,7 +83,7 @@ MGLQUAKE = $(BIN_PREFIX)-mgl
endif
ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl
GLQUAKE =$(BIN_PREFIX)-glx
endif
ifeq ($(HAS_TDFXGL),yes)
@ -319,7 +319,7 @@ X11_CFLAGS = -DX11 @X_CFLAGS@
X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@
# FIXME: This rule is pathological because of the seperate sunx driver,
# either merge it into vid_x.c or make a seperate sun target. In either
# either merge it into vid_x11.c or make a seperate sun target. In either
# case, find the moro^wpeople responsible for this and other stupidities
# in Solaris and "educate" them.
$(BUILD_DIR)/$(addsuffix .@OBJEXT@,$(basename @X11_VID_SRC@ .c)):\

4
uquake/Makefile.in
View file

@ -62,7 +62,7 @@ MAKE_SURE_DIR = if test -d "$(BUILD_DIR)/$$DIR"; \
COMMON_LIB=common_lib.a
ifeq ($(HAS_OGL),yes)
GLQUAKE =$(BIN_PREFIX)-gl
GLQUAKE =$(BIN_PREFIX)-glx
endif
ifeq ($(HAS_TDFXGL),yes)
@ -284,7 +284,7 @@ X11_CFLAGS = -DX11 @X_CFLAGS@
X11_LDFLAGS = @X_LIBS@ -lX11 @X11_SHM_LIB@ @X_EXTRA_LIBS@
# FIXME: This rule is pathological because of the seperate sunx driver,
# either merge it into vid_x.c or make a seperate sun target. In either
# either merge it into vid_x11.c or make a seperate sun target. In either
# case, find the moro^wpeople responsible for this and other stupidities
# in Solaris and "educate" them.
$(BUILD_DIR)/$(addsuffix .@OBJEXT@,$(basename @X11_VID_SRC@ .c)):\