From 28147f7e1a42f67b4e978ca2ff28093cac79b1ea Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Fri, 5 Apr 2002 00:24:29 +0000 Subject: [PATCH] * Moved ref_gl into src/ so that when it builds, the video refreshers are in the same directory as the quake2 binary --- configure.in | 19 +++- ref_gl/anorms.h | 181 ------------------------------------- src/Makefile.am | 26 +++++- {ref_gl => src}/anormtab.h | 0 {ref_gl => src}/gl_draw.c | 0 {ref_gl => src}/gl_image.c | 0 {ref_gl => src}/gl_light.c | 0 {ref_gl => src}/gl_local.h | 0 {ref_gl => src}/gl_mesh.c | 0 {ref_gl => src}/gl_model.c | 0 {ref_gl => src}/gl_model.h | 0 {ref_gl => src}/gl_rmain.c | 0 {ref_gl => src}/gl_rmisc.c | 0 {ref_gl => src}/gl_rsurf.c | 0 {ref_gl => src}/gl_warp.c | 0 {ref_gl => src}/qgl.h | 0 {ref_gl => src}/ref_gl.def | 0 {ref_gl => src}/ref_gl.dsp | 0 src/ref_soft/.gitignore | 3 + src/ref_soft/Makefile.am | 2 + {ref_gl => src}/warpsin.h | 0 21 files changed, 45 insertions(+), 186 deletions(-) delete mode 100644 ref_gl/anorms.h rename {ref_gl => src}/anormtab.h (100%) rename {ref_gl => src}/gl_draw.c (100%) rename {ref_gl => src}/gl_image.c (100%) rename {ref_gl => src}/gl_light.c (100%) rename {ref_gl => src}/gl_local.h (100%) rename {ref_gl => src}/gl_mesh.c (100%) rename {ref_gl => src}/gl_model.c (100%) rename {ref_gl => src}/gl_model.h (100%) rename {ref_gl => src}/gl_rmain.c (100%) rename {ref_gl => src}/gl_rmisc.c (100%) rename {ref_gl => src}/gl_rsurf.c (100%) rename {ref_gl => src}/gl_warp.c (100%) rename {ref_gl => src}/qgl.h (100%) rename {ref_gl => src}/ref_gl.def (100%) rename {ref_gl => src}/ref_gl.dsp (100%) create mode 100644 src/ref_soft/.gitignore create mode 100644 src/ref_soft/Makefile.am rename {ref_gl => src}/warpsin.h (100%) diff --git a/configure.in b/configure.in index 180b308..c1c6ad7 100644 --- a/configure.in +++ b/configure.in @@ -1,12 +1,25 @@ # Process this file with autoconf to produce a configure script. -AC_INIT AC_PREREQ(2.50) -AM_INIT_AUTOMAKE(quake2, 0.1, quake2-devel@quakeforge.net) -#AC_CONFIG_SRCDIR(src/main.c) +AC_INIT(src/main.c) +AC_REVISION($Revision$) dnl AM_CONFIG_HEADER(config.h) +dnl AC_CANONICAL_SYSTEM # what does this do? + +dnl AC_VALIDATE_CACHED_SYSTEM_TUPLE( +dnl rm $cache_file +dnl echo restart configure +dnl exit 1 +dnl ) + +AM_INIT_AUTOMAKE(quake2, 0.1, quake2-devel@quakeforge.net) + AM_MAINTAINER_MODE +AC_SUBST(PROGRAM) +AC_SUBST(VERSION) + + # Checks for programs. AC_PROG_CC AC_PROG_RANLIB diff --git a/ref_gl/anorms.h b/ref_gl/anorms.h deleted file mode 100644 index 011582e..0000000 --- a/ref_gl/anorms.h +++ /dev/null @@ -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}, diff --git a/src/Makefile.am b/src/Makefile.am index cbaa886..ea4c364 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,10 @@ # Process this file with automake to create Makefile.in -bin_PROGRAMS = quake2 +SUBDIRS = . + +bin_PROGRAMS = quake2 ref_glx.so + quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \ \ cl_cin.c cl_ents.c cl_fx.c cl_input.c cl_inv.c \ @@ -24,6 +27,25 @@ quake2_SOURCES = main.c q_sh.c vid_menu.c vid_so.c glob.c net_udp.c \ m_flash.c \ \ #snd_mixa.S - + +REF_GL = q_sh.c q_shared.c 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 + +ref_glx_so_SOURCES = $(REF_GL) gl_glx.c + +#ref_fxgl_so_SOURCES = $(REF_GL) rw_in_svgalib.c gl_fxmesa.c + +#ref_sdlgl_so_SOURCES = $(REF_GL) rw_sdl.c + AM_CFLAGS = -Wall -Werror -pipe AM_CPPFLAGS = -DLINUX_VERSION="\"$(VERSION)\"" -Dstricmp=strcasecmp -I../game diff --git a/ref_gl/anormtab.h b/src/anormtab.h similarity index 100% rename from ref_gl/anormtab.h rename to src/anormtab.h diff --git a/ref_gl/gl_draw.c b/src/gl_draw.c similarity index 100% rename from ref_gl/gl_draw.c rename to src/gl_draw.c diff --git a/ref_gl/gl_image.c b/src/gl_image.c similarity index 100% rename from ref_gl/gl_image.c rename to src/gl_image.c diff --git a/ref_gl/gl_light.c b/src/gl_light.c similarity index 100% rename from ref_gl/gl_light.c rename to src/gl_light.c diff --git a/ref_gl/gl_local.h b/src/gl_local.h similarity index 100% rename from ref_gl/gl_local.h rename to src/gl_local.h diff --git a/ref_gl/gl_mesh.c b/src/gl_mesh.c similarity index 100% rename from ref_gl/gl_mesh.c rename to src/gl_mesh.c diff --git a/ref_gl/gl_model.c b/src/gl_model.c similarity index 100% rename from ref_gl/gl_model.c rename to src/gl_model.c diff --git a/ref_gl/gl_model.h b/src/gl_model.h similarity index 100% rename from ref_gl/gl_model.h rename to src/gl_model.h diff --git a/ref_gl/gl_rmain.c b/src/gl_rmain.c similarity index 100% rename from ref_gl/gl_rmain.c rename to src/gl_rmain.c diff --git a/ref_gl/gl_rmisc.c b/src/gl_rmisc.c similarity index 100% rename from ref_gl/gl_rmisc.c rename to src/gl_rmisc.c diff --git a/ref_gl/gl_rsurf.c b/src/gl_rsurf.c similarity index 100% rename from ref_gl/gl_rsurf.c rename to src/gl_rsurf.c diff --git a/ref_gl/gl_warp.c b/src/gl_warp.c similarity index 100% rename from ref_gl/gl_warp.c rename to src/gl_warp.c diff --git a/ref_gl/qgl.h b/src/qgl.h similarity index 100% rename from ref_gl/qgl.h rename to src/qgl.h diff --git a/ref_gl/ref_gl.def b/src/ref_gl.def similarity index 100% rename from ref_gl/ref_gl.def rename to src/ref_gl.def diff --git a/ref_gl/ref_gl.dsp b/src/ref_gl.dsp similarity index 100% rename from ref_gl/ref_gl.dsp rename to src/ref_gl.dsp diff --git a/src/ref_soft/.gitignore b/src/ref_soft/.gitignore new file mode 100644 index 0000000..051d1bd --- /dev/null +++ b/src/ref_soft/.gitignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in +.deps diff --git a/src/ref_soft/Makefile.am b/src/ref_soft/Makefile.am new file mode 100644 index 0000000..02b5f16 --- /dev/null +++ b/src/ref_soft/Makefile.am @@ -0,0 +1,2 @@ +# $Id$ + diff --git a/ref_gl/warpsin.h b/src/warpsin.h similarity index 100% rename from ref_gl/warpsin.h rename to src/warpsin.h