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

* Moved ref_soft into src/, made it build.

Browse source 
* Lots of LD and CFLAGS in src/Makefile.am... I think most
  of it should be automagic by configure
This commit is contained in:
Jamie Wilkinson 2002-04-06 05:03:53 +00:00
parent 1c775689ab
commit bd99d9b499
53 changed files with 168 additions and 1335 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1077
ref_soft/adivtab.h
View file

File diff suppressed because it is too large Load diff

181
ref_soft/anorms.h
View file

@ -1,181 +0,0 @@
/*
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.
*/
{-0.525731, 0.000000, 0.850651},
{-0.442863, 0.238856, 0.864188},
{-0.295242, 0.000000, 0.955423},
{-0.309017, 0.500000, 0.809017},
{-0.162460, 0.262866, 0.951056},
{0.000000, 0.000000, 1.000000},
{0.000000, 0.850651, 0.525731},
{-0.147621, 0.716567, 0.681718},
{0.147621, 0.716567, 0.681718},
{0.000000, 0.525731, 0.850651},
{0.309017, 0.500000, 0.809017},
{0.525731, 0.000000, 0.850651},
{0.295242, 0.000000, 0.955423},
{0.442863, 0.238856, 0.864188},
{0.162460, 0.262866, 0.951056},
{-0.681718, 0.147621, 0.716567},
{-0.809017, 0.309017, 0.500000},
{-0.587785, 0.425325, 0.688191},
{-0.850651, 0.525731, 0.000000},
{-0.864188, 0.442863, 0.238856},
{-0.716567, 0.681718, 0.147621},
{-0.688191, 0.587785, 0.425325},
{-0.500000, 0.809017, 0.309017},
{-0.238856, 0.864188, 0.442863},
{-0.425325, 0.688191, 0.587785},
{-0.716567, 0.681718, -0.147621},
{-0.500000, 0.809017, -0.309017},
{-0.525731, 0.850651, 0.000000},
{0.000000, 0.850651, -0.525731},
{-0.238856, 0.864188, -0.442863},
{0.000000, 0.955423, -0.295242},
{-0.262866, 0.951056, -0.162460},
{0.000000, 1.000000, 0.000000},
{0.000000, 0.955423, 0.295242},
{-0.262866, 0.951056, 0.162460},
{0.238856, 0.864188, 0.442863},
{0.262866, 0.951056, 0.162460},
{0.500000, 0.809017, 0.309017},
{0.238856, 0.864188, -0.442863},
{0.262866, 0.951056, -0.162460},
{0.500000, 0.809017, -0.309017},
{0.850651, 0.525731, 0.000000},
{0.716567, 0.681718, 0.147621},
{0.716567, 0.681718, -0.147621},
{0.525731, 0.850651, 0.000000},
{0.425325, 0.688191, 0.587785},
{0.864188, 0.442863, 0.238856},
{0.688191, 0.587785, 0.425325},
{0.809017, 0.309017, 0.500000},
{0.681718, 0.147621, 0.716567},
{0.587785, 0.425325, 0.688191},
{0.955423, 0.295242, 0.000000},
{1.000000, 0.000000, 0.000000},
{0.951056, 0.162460, 0.262866},
{0.850651, -0.525731, 0.000000},
{0.955423, -0.295242, 0.000000},
{0.864188, -0.442863, 0.238856},
{0.951056, -0.162460, 0.262866},
{0.809017, -0.309017, 0.500000},
{0.681718, -0.147621, 0.716567},
{0.850651, 0.000000, 0.525731},
{0.864188, 0.442863, -0.238856},
{0.809017, 0.309017, -0.500000},
{0.951056, 0.162460, -0.262866},
{0.525731, 0.000000, -0.850651},
{0.681718, 0.147621, -0.716567},
{0.681718, -0.147621, -0.716567},
{0.850651, 0.000000, -0.525731},
{0.809017, -0.309017, -0.500000},
{0.864188, -0.442863, -0.238856},
{0.951056, -0.162460, -0.262866},
{0.147621, 0.716567, -0.681718},
{0.309017, 0.500000, -0.809017},
{0.425325, 0.688191, -0.587785},
{0.442863, 0.238856, -0.864188},
{0.587785, 0.425325, -0.688191},
{0.688191, 0.587785, -0.425325},
{-0.147621, 0.716567, -0.681718},
{-0.309017, 0.500000, -0.809017},
{0.000000, 0.525731, -0.850651},
{-0.525731, 0.000000, -0.850651},
{-0.442863, 0.238856, -0.864188},
{-0.295242, 0.000000, -0.955423},
{-0.162460, 0.262866, -0.951056},
{0.000000, 0.000000, -1.000000},
{0.295242, 0.000000, -0.955423},
{0.162460, 0.262866, -0.951056},
{-0.442863, -0.238856, -0.864188},
{-0.309017, -0.500000, -0.809017},
{-0.162460, -0.262866, -0.951056},
{0.000000, -0.850651, -0.525731},
{-0.147621, -0.716567, -0.681718},
{0.147621, -0.716567, -0.681718},
{0.000000, -0.525731, -0.850651},
{0.309017, -0.500000, -0.809017},
{0.442863, -0.238856, -0.864188},
{0.162460, -0.262866, -0.951056},
{0.238856, -0.864188, -0.442863},
{0.500000, -0.809017, -0.309017},
{0.425325, -0.688191, -0.587785},
{0.716567, -0.681718, -0.147621},
{0.688191, -0.587785, -0.425325},
{0.587785, -0.425325, -0.688191},
{0.000000, -0.955423, -0.295242},
{0.000000, -1.000000, 0.000000},
{0.262866, -0.951056, -0.162460},
{0.000000, -0.850651, 0.525731},
{0.000000, -0.955423, 0.295242},
{0.238856, -0.864188, 0.442863},
{0.262866, -0.951056, 0.162460},
{0.500000, -0.809017, 0.309017},
{0.716567, -0.681718, 0.147621},
{0.525731, -0.850651, 0.000000},
{-0.238856, -0.864188, -0.442863},
{-0.500000, -0.809017, -0.309017},
{-0.262866, -0.951056, -0.162460},
{-0.850651, -0.525731, 0.000000},
{-0.716567, -0.681718, -0.147621},
{-0.716567, -0.681718, 0.147621},
{-0.525731, -0.850651, 0.000000},
{-0.500000, -0.809017, 0.309017},
{-0.238856, -0.864188, 0.442863},
{-0.262866, -0.951056, 0.162460},
{-0.864188, -0.442863, 0.238856},
{-0.809017, -0.309017, 0.500000},
{-0.688191, -0.587785, 0.425325},
{-0.681718, -0.147621, 0.716567},
{-0.442863, -0.238856, 0.864188},
{-0.587785, -0.425325, 0.688191},
{-0.309017, -0.500000, 0.809017},
{-0.147621, -0.716567, 0.681718},
{-0.425325, -0.688191, 0.587785},
{-0.162460, -0.262866, 0.951056},
{0.442863, -0.238856, 0.864188},
{0.162460, -0.262866, 0.951056},
{0.309017, -0.500000, 0.809017},
{0.147621, -0.716567, 0.681718},
{0.000000, -0.525731, 0.850651},
{0.425325, -0.688191, 0.587785},
{0.587785, -0.425325, 0.688191},
{0.688191, -0.587785, 0.425325},
{-0.955423, 0.295242, 0.000000},
{-0.951056, 0.162460, 0.262866},
{-1.000000, 0.000000, 0.000000},
{-0.850651, 0.000000, 0.525731},
{-0.955423, -0.295242, 0.000000},
{-0.951056, -0.162460, 0.262866},
{-0.864188, 0.442863, -0.238856},
{-0.951056, 0.162460, -0.262866},
{-0.809017, 0.309017, -0.500000},
{-0.864188, -0.442863, -0.238856},
{-0.951056, -0.162460, -0.262866},
{-0.809017, -0.309017, -0.500000},
{-0.681718, 0.147621, -0.716567},
{-0.681718, -0.147621, -0.716567},
{-0.850651, 0.000000, -0.525731},
{-0.688191, 0.587785, -0.425325},
{-0.587785, 0.425325, -0.688191},
{-0.425325, 0.688191, -0.587785},
{-0.425325, -0.688191, -0.587785},
{-0.587785, -0.425325, -0.688191},
{-0.688191, -0.587785, -0.425325},

90
src/Makefile.am
View file

@ -4,7 +4,7 @@
SUBDIRS = .
bin_PROGRAMS = quake2 ref_glx.so
bin_PROGRAMS = quake2 ref_glx.so ref_softx.so
quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
\
@ -28,7 +28,7 @@ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \
\
#snd_mixa.S
REF_GL = q_sh.c q_shared.c glob.c \
REF_GL_COMMON = q_sh.c q_shared.c glob.c \
qgl.c \
\
gl_draw.c \
@ -41,20 +41,88 @@ REF_GL = q_sh.c q_shared.c glob.c \
gl_rsurf.c \
gl_warp.c
ref_glx_so_SOURCES = $(REF_GL) gl_glx.c
# GLX
ref_glx_so_SOURCES = $(REF_GL_COMMON) gl_glx.c
#ref_fxgl_so_SOURCES = $(REF_GL) rw_in_svgalib.c gl_fxmesa.c
# 3dFX
#ref_fxgl_so_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
#ref_sdlgl_so_SOURCES = $(REF_GL) rw_sdl.c
# SDL
#ref_sdlgl_so_SOURCES = $(REF_GL_COMMON) rw_sdl.c
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
REF_SOFT_ASM = \
r_aclipa.S \
r_draw16.S \
r_drawa.S \
r_edgea.S \
r_scana.S \
r_spr8.S\
r_surf8.S \
math.S \
d_polysa.S \
r_varsa.S \
sys_dosa.S
# SVGAlib
#ref_soft_so_SOURCES = $(REF_SOFT_COMMON) rw_svgalib.c rw_in_svgalib.c d_copy.S
# X11
ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c
# SDL
#ref_softsdl_so_SOURCES = $(REF_SOFT_COMMON) rw_sdl.c
$(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
$(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
$(BUILDDIR)/ref_softsdl.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SDL_OBJS)
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
$(REF_SOFT_SDL_OBJS) $(SDLLDFLAGS)
AM_CFLAGS = -Wall -Werror -pipe
AM_CPPFLAGS = -Dstricmp=strcasecmp -I../game
ref_glx_so_CFLAGS = -fPIC
ref_glx_so_LDFLAGS = -shared
ref_glx_so_CFLAGS = -fPIC -I/usr/X11R6/include
ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
#ref_fxgl_so_CFLAGS = -fPIC
#ref_fxgl_so_LDFLAGS = -shared
#ref_fxgl_so_CFLAGS = -fPIC -I/usr/X11R6/include
#ref_fxgl_so_LDFLAGS = -shared -L/usr/local/glide/lib -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lGL -lvga
#ref_sdlgl_so_CFLAGS = -fPIC
#ref_sdlgl_so_LDFLAGS = -shared
#ref_sdlgl_so_CFLAGS = -fPIC $(shell sdl-config --cflags) -DOPENGL
#ref_sdlgl_so_LDFLAGS = -shared $(shell sdl-config --libs)
#ref_soft_so_CFLAGS = -fPIC
#ref_soft_so_LDFLAGS = -shared -lvga
ref_softx_so_CFLAGS = -fPIC -I/usr/X11R6/include
ref_softx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
#ref_softsdl_so_CFLAGS = -fPIC $(shell sdl-config --cflags)
#ref_softsdl_so_LDFLAGS = -shared $(shell sdl-config --libs)

23
src/adivtab.h
View file

@ -1,4 +1,25 @@
// table of quotients and remainders for [-15...16] / [-15...16]
/* $Id$
*
* table of quotients and remainders for [-15...16] / [-15...16]
*
* 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.
*/
// numerator = -15
{1, 0},

0
ref_soft/asm_draw.h → src/asm_draw.h
View file

0
ref_soft/block16.inc → src/block16.inc
View file

0
ref_soft/block8.inc → src/block8.inc
View file

0
ref_soft/d_copy.S → src/d_copy.S
View file

0
ref_soft/d_if.inc → src/d_if.inc
View file

49
src/d_ifacea.h
View file

@ -1,27 +1,25 @@
/*
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.
*/
//
// d_ifacea.h
//
// Include file for asm driver interface.
//
/* $Id$
*
* Include file for asm driver interface.
*
* 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.
*/
//
// !!! note that this file must match the corresponding C structures in
@ -39,8 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// !!! if this is changed, it must be changed in r_shared.h too !!!
#define MAXHEIGHT 1024
/* #define MAXHEIGHT 1200 -- from ref_soft definition */
// !!! if this is changed, it must be changed in quakedef.h too !!!
// !!! if this is changed, it must be changed in quakedef.h too !!! (or qcommon.h)
#define CACHE_SIZE 32 // used to align key data structures
// particle_t structure

0
ref_soft/d_polysa.S → src/d_polysa.S
View file

0
ref_soft/math.S → src/math.S
View file

0
ref_soft/qasm.inc → src/qasm.inc
View file

0
ref_soft/r_aclip.c → src/r_aclip.c
View file

0
ref_soft/r_aclipa.S → src/r_aclipa.S
View file

0
ref_soft/r_aclipa.asm → src/r_aclipa.asm
View file

0
ref_soft/r_alias.c → src/r_alias.c
View file

0
ref_soft/r_bsp.c → src/r_bsp.c
View file

0
ref_soft/r_draw.c → src/r_draw.c
View file

0
ref_soft/r_draw16.S → src/r_draw16.S
View file

0
ref_soft/r_draw16.asm → src/r_draw16.asm
View file

0
ref_soft/r_drawa.S → src/r_drawa.S
View file

0
ref_soft/r_drawa.asm → src/r_drawa.asm
View file

0
ref_soft/r_edge.c → src/r_edge.c
View file

0
ref_soft/r_edgea.S → src/r_edgea.S
View file

0
ref_soft/r_edgea.asm → src/r_edgea.asm
View file

0
ref_soft/r_image.c → src/r_image.c
View file

0
ref_soft/r_light.c → src/r_light.c
View file

41
ref_soft/r_local.h → src/r_local.h
View file

@ -1,22 +1,23 @@
/*
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 <stdlib.h>
@ -24,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <math.h>
#include <stdarg.h>
#include "../client/ref.h"
#include "ref.h"
#define REF_VERSION "SOFT 0.01"

0
ref_soft/r_main.c → src/r_main.c
View file

0
ref_soft/r_misc.c → src/r_misc.c
View file

0
ref_soft/r_model.c → src/r_model.c
View file

0
ref_soft/r_model.h → src/r_model.h
View file

0
ref_soft/r_part.c → src/r_part.c
View file

0
ref_soft/r_poly.c → src/r_poly.c
View file

0
ref_soft/r_polysa.asm → src/r_polysa.asm
View file

0
ref_soft/r_polyse.c → src/r_polyse.c
View file

0
ref_soft/r_rast.c → src/r_rast.c
View file

0
ref_soft/r_scan.c → src/r_scan.c
View file

0
ref_soft/r_scana.S → src/r_scana.S
View file

0
ref_soft/r_scana.asm → src/r_scana.asm
View file

0
ref_soft/r_spr8.S → src/r_spr8.S
View file

0
ref_soft/r_spr8.asm → src/r_spr8.asm
View file

0
ref_soft/r_sprite.c → src/r_sprite.c
View file

0
ref_soft/r_surf.c → src/r_surf.c
View file

0
ref_soft/r_surf8.S → src/r_surf8.S
View file

0
ref_soft/r_surf8.asm → src/r_surf8.asm
View file

0
ref_soft/r_varsa.S → src/r_varsa.S
View file

0
ref_soft/r_varsa.asm → src/r_varsa.asm
View file

0
ref_soft/rand1k.h → src/rand1k.h
View file

0
ref_soft/ref_soft.def → src/ref_soft.def
View file

0
ref_soft/ref_soft.dsp → src/ref_soft.dsp
View file

42
src/rw_x11.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_X11.C
**
@ -51,8 +53,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <X11/extensions/XShm.h>
#include <X11/extensions/xf86dga.h>
#include "../ref_soft/r_local.h"
#include "../client/keys.h"
#include "r_local.h"
#include "keys.h"
#include "rw.h"
/*****************************************************************************/