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

* Now builds all video refreshers (except ref_fxgl.so

Browse source 
because I don't have GL/fxmesa.h)  Time to learn how
  configure can selectively build refreshers.
This commit is contained in:
Jamie Wilkinson 2002-04-07 01:07:20 +00:00
parent 9b44da971f
commit 167eba82c0
5 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/Makefile.am
View file

@ -4,7 +4,10 @@
#SUBDIRS = . baseq2 ctf #SUBDIRS = . baseq2 ctf
SUBDIRS = . baseq2 ctf xatrix rogue SUBDIRS = . baseq2 ctf xatrix rogue
bin_PROGRAMS = quake2 ref_glx.so ref_softx.so bin_PROGRAMS = quake2 \
ref_soft.so ref_softx.so ref_softsdl.so \
ref_glx.so ref_sdlgl.so
# ref_fxgl.so
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 glob.c net_udp.c \
\ \
@ -48,7 +51,7 @@ ref_glx_so_SOURCES = $(REF_GL_COMMON) gl_glx.c
#ref_fxgl_so_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c #ref_fxgl_so_SOURCES = $(REF_GL_COMMON) rw_in_svgalib.c gl_fxmesa.c
# SDL # SDL
#ref_sdlgl_so_SOURCES = $(REF_GL_COMMON) rw_sdl.c ref_sdlgl_so_SOURCES = $(REF_GL_COMMON) rw_sdl.c
REF_SOFT_COMMON = \ REF_SOFT_COMMON = \
r_aclip.c \ r_aclip.c \
@ -86,32 +89,26 @@ REF_SOFT_ASM = \
sys_dosa.S sys_dosa.S
# SVGAlib # SVGAlib
#ref_soft_so_SOURCES = $(REF_SOFT_COMMON) rw_svgalib.c rw_in_svgalib.c d_copy.S ref_soft_so_SOURCES = $(REF_SOFT_COMMON) rw_svgalib.c rw_in_svgalib.c d_copy.S
# X11 # X11
ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c ref_softx_so_SOURCES = $(REF_SOFT_COMMON) rw_x11.c
# SDL # SDL
#ref_softsdl_so_SOURCES = $(REF_SOFT_COMMON) rw_sdl.c ref_softsdl_so_SOURCES = $(REF_SOFT_COMMON) rw_sdl.c
AM_CFLAGS = -Wall -Werror -pipe AM_CFLAGS = -Wall -Werror -pipe -I/usr/X11R6/include $(shell sdl-config --cflags) -DOPENGL
quake2_LDFLAGS = -lm -ldl -lpthread quake2_LDFLAGS = -lm -ldl -lpthread
ref_glx_so_CFLAGS = -fPIC -I/usr/X11R6/include #ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
ref_glx_so_LDFLAGS = -shared -L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm
#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_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 $(shell sdl-config --cflags) -DOPENGL ref_sdlgl_so_LDFLAGS = -shared $(shell sdl-config --libs)
#ref_sdlgl_so_LDFLAGS = -shared $(shell sdl-config --libs)
#ref_soft_so_CFLAGS = -fPIC ref_soft_so_LDFLAGS = -shared -lvga
#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_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)
#ref_softsdl_so_LDFLAGS = -shared $(shell sdl-config --libs)

8
src/gl_fxmesa.c
View file

@ -40,11 +40,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <signal.h> #include <signal.h>
#include <dlfcn.h> #include <dlfcn.h>
#include "../ref_gl/gl_local.h" #include "gl_local.h"
#include "../client/keys.h" #include "keys.h"
#include "../linux/rw_linux.h" #include "rw.h"
#include "../linux/glw_linux.h" #include "glw.h"
#include <GL/fxmesa.h> #include <GL/fxmesa.h>

4
src/rw_in_svgalib.c
View file

@ -30,8 +30,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "vgakeyboard.h" #include "vgakeyboard.h"
#include "vgamouse.h" #include "vgamouse.h"
#include "../ref_soft/r_local.h" #include "r_local.h"
#include "../client/keys.h" #include "keys.h"
#include "rw.h" #include "rw.h"
/*****************************************************************************/ /*****************************************************************************/

10
src/rw_sdl.c
View file

@ -26,14 +26,14 @@
#endif #endif
#ifdef OPENGL #ifdef OPENGL
#include "../ref_gl/gl_local.h" #include "gl_local.h"
#include "../src/glw.h" #include "glw.h"
#else #else
#include "../ref_soft/r_local.h" #include "r_local.h"
#endif #endif
#include "../client/keys.h" #include "keys.h"
#include "../src/rw.h" #include "rw.h"
/*****************************************************************************/ /*****************************************************************************/

4
src/rw_svgalib.c
View file

@ -46,8 +46,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "vgakeyboard.h" #include "vgakeyboard.h"
#include "vgamouse.h" #include "vgamouse.h"
#include "../ref_soft/r_local.h" #include "r_local.h"
#include "../client/keys.h" #include "keys.h"
#include "rw.h" #include "rw.h"
/*****************************************************************************/ /*****************************************************************************/