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

- Fixed compile errors with joystick support.

Browse source
This commit is contained in:
Jamie Wilkinson 2002-10-13 23:08:24 +00:00
parent 6f2e45766a
commit fc17439847
4 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Makefile.am
View file

@ -11,7 +11,7 @@ EXTRA_LTLIBRARIES = ref_soft.la ref_softx.la ref_softsdl.la \
ref_glx.la ref_sdlgl.la ref_tdfx.la
# Common source files
REF_GL_COMMON = q_sh.c q_shared.c glob.c qgl.c \
REF_GL_COMMON = q_sh.c q_shared.c q_glob.c qgl.c \
gl_draw.c gl_image.c gl_light.c gl_mesh.c \
gl_model.c gl_rmain.c gl_rmisc.c gl_rsurf.c \
gl_warp.c
@ -20,11 +20,11 @@ REF_SOFT_COMMON = r_aclip.c r_alias.c r_bsp.c r_draw.c r_edge.c \
r_image.c r_light.c r_main.c r_misc.c r_model.c \
r_part.c r_poly.c r_polyse.c r_rast.c r_scan.c \
r_sprite.c r_surf.c \
q_shared.c q_sh.c glob.c
q_shared.c q_sh.c q_glob.c
noinst_HEADERS = adivtab.h anorms.h anormtab.h asm_draw.h asm_i386.h block8.h \
block16.h cdaudio.h client.h console.h crc.h d_ifacea.h game.h \
gcc_attr.h gl_local.h gl_model.h glob.h glw.h input.h keys.h \
gcc_attr.h gl_local.h gl_model.h q_glob.h glw.h input.h keys.h \
mdfour.h q_shared.h qasm.h qcommon.h qfiles.h qgl.h qmenu.h \
quakeio.h r_local.h r_model.h rand1k.h ref.h rw.h screen.h \
server.h snd_loc.h sound.h uint32.h vid.h warpsin.h \
@ -44,7 +44,7 @@ else
QUAKE2_ASM=
endif
quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c q_glob.c net_udp.c \
\
cl_cin.c cl_ents.c cl_fx.c cl_input.c cl_inv.c \
cl_main.c cl_parse.c cl_pred.c cl_tent.c cl_scrn.c \

4
src/gl_glx.c
View file

@ -68,6 +68,8 @@
#include <X11/extensions/xf86vmode.h>
#ifdef HAVE_JOYSTICK
#include <sys/types.h>
#include <fcntl.h>
#include <linux/joystick.h>
#include <glob.h>
#endif
@ -125,7 +127,7 @@ void init_joystick() {
ri.Con_Printf(PRINT_ALL, "Trying joystick dev %s\n", pglob.gl_pathv[i]);
joy_fd = open(pglob.gl_pathv[i], O_RDONLY | O_NONBLOCK);
if (joy_fd == -1)
ri.Con_Printf(PRINT_ALL, "Error opening joystick dev %s\n", pglob.gp_pathv[i]);
ri.Con_Printf(PRINT_ALL, "Error opening joystick dev %s\n", pglob.gl_pathv[i]);
else {
while (read(joy_fd, &e, sizeof(struct js_event)) != -1 && (e.type &JS_EVENT_INIT))
ri.Con_Printf(PRINT_ALL, "Read init event\n");

41
src/q_glob.c
View file

@ -1,25 +1,26 @@
/*
Copyright (C) 1997-2001 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 the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $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.
*/
#include <stdio.h>
#include "glob.h"
#include "q_glob.h"
/* Like glob_match, but match PATTERN against any final segment of TEXT. */
static int glob_match_after_star(char *pattern, char *text)

2
src/q_sh.c
View file

@ -31,7 +31,7 @@
#include <sys/mman.h>
#include <sys/time.h>
#include "glob.h"
#include "q_glob.h"
#include "qcommon.h"