qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-31 05:00:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

*whack* Die Mole Die!!!

Browse source
This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-04-15 06:18:06 +00:00
parent 6c65be497e
commit 20e0961ed2
2 changed files with 24 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nq/source/Makefile.am
View file

@ -139,7 +139,6 @@ nq_glx_SOURCES= $(combined_SOURCES) $(ogl_SOURCES)
nq_glx_LDADD= $(client_LIBS) $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFglx.la
nq_glx_DEPENDENCIES= $(client_LIB_DEPS)
#
# ... Simple Directmedia Layer, version 1.1 and higher, in GL mode
nq_sgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES)
nq_sgl_LDADD= $(client_LIBS) $(X_LIBS) $(SDL_LIBS) $(GLX_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la
@ -147,8 +146,7 @@ nq_sgl_DEPENDENCIES= $(client_LIB_DEPS)
# ... SGI/Microsoft WGL (Windows OpenGL)
wgl_SOURCES= vid_wgl.c conproc.c
nq_wgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES)
nq_wgl_SOURCES= $(combined_SOURCES) $(ogl_SOURCES) conproc.c
nq_wgl_LDADD= $(client_LIBS) $(GLX_LIBS) ../../libs/video/targets/libQFwgl.la -lgdi32 -lcomctl32
nq_wgl_DEPENDENCIES= $(client_LIB_DEPS)
@ -161,7 +159,6 @@ nq_server_DEPENDENCIES= libqfnet.a
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
# or it won't be distributed with 'make dist'
#
EXTRA_DIST= #nq.dsp dirent.c fnmatch.c sys_unix.c sys_win.c
# Kill the temp files, hopefully.

104
qw/source/Makefile.am
View file

@ -26,12 +26,11 @@
#
# $Id$
#
AUTOMAKE_OPTIONS= foreign
#
# Stuff that is common to both client and server
#
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include
bin_PROGRAMS = @QW_TARGETS@
@ -41,7 +40,6 @@ EXTRA_PROGRAMS= qw-client-3dfx qw-client-fbdev \
qw-client-x11 qw-server
noinst_LIBRARIES= libqfnet.a
#libqfsys_cl.a libqfsys_sv.a
if PACKETLOG
packetlogger = net_packetlog.c
@ -55,9 +53,7 @@ common_SOURCES= buildnum.c com.c \
pmove.c pmovetst.c \
$(math_ASM) $(packetlogger)
#
# ... Network type
#
if NETTYPE_IPV6
libqfnet_a_SOURCES= net_chan.c net_udp6.c
else
@ -65,11 +61,9 @@ libqfnet_a_SOURCES= net_chan.c net_udp.c
endif
EXTRA_libqfnet_a_SOURCES= net_chan.c net_udp.c net_udp6.c
#
# Server builds
#
# ... System type
#
if SYSTYPE_WIN32
syssv_SRC= fnmatch.c dirent.c sv_sys_win.c
else
@ -91,11 +85,9 @@ qw_server_LDADD= $(top_builddir)/libs/util/libQFutil.la \
-L. -lqfnet $(NET_LIBS) $(DL_LIBS)
qw_server_DEPENDENCIES= libqfnet.a
#
# Client builds
#
# ... System type
#
if SYSTYPE_WIN32
syscl_SRC= cl_sys_win.c fnmatch.c dirent.c
else
@ -120,11 +112,9 @@ client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
console.c keys.c locs.c model_alias.c model_sprite.c nonintel.c \
pcx.c r_efrag.c r_view.c sbar.c skin.c teamplay.c tga.c wad.c $(client_ASM) $(syscl_SRC)
#
# Software-rendering clients
#
# ... Common stuff
#
if ASM_ARCH
soft_ASM= d_draw.S d_draw16.S d_parta.S d_polysa.S d_scana.S d_spr8.S \
d_varsa.S sw_raclipa.S sw_raliasa.S sw_rdrawa.S sw_redgea.S sw_rvarsa.S \
@ -139,65 +129,35 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c \
screen.c $(soft_ASM) sw_model_alias.c sw_model_brush.c \
sw_model_sprite.c
#
# ... Linux FBDev
#
YFLAGS = -d
fbdev_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l vid_fbdev.c in_fbdev.c
YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h fbset_modes_y.tab.h fbset_modes_l.c
EXTRA_qw_client_fbdev_SOURCES=fbset_modes_y.h
fbset_modes_y.o: fbset_modes_y.c
$(COMPILE) -Wno-error -c fbset_modes_y.c
fbset_modes_l.o: fbset_modes_l.c
$(COMPILE) -Wno-error -c fbset_modes_l.c
qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(fbdev_SOURCES)
qw_client_fbdev_LDADD= $(CLIENT_LIBS)
qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
qw_client_fbdev_LDADD= $(CLIENT_LIBS) ../../libs/video/targets/libQFfbdev.la
qw_client_fbdev_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# ... SciTech MGL
#
mgl_SOURCES= in_win.c vid_common_sw.c vid_mgl.c
qw_client_mgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(mgl_SOURCES)
qw_client_mgl_LDADD= $(MGL_LIBS) $(CLIENT_LIBS)
qw_client_mgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
qw_client_mgl_LDADD= $(MGL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFmgl.la
qw_client_mgl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.0 and higher
#
sdl_SOURCES= in_sdl.c vid_common_sw.c vid_sdl.c
qw_client_sdl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(sdl_SOURCES)
qw_client_sdl_LDADD= $(SDL_LIBS) $(CLIENT_LIBS)
# ... Simple DirectMedia Layer, version 1.0 and higher
qw_client_sdl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
qw_client_sdl_LDADD= $(SDL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsdl.la
qw_client_sdl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# ... Linux SVGAlib
#
svga_SOURCES= d_copy.S in_svgalib.c vid_common_sw.c vid_svgalib.c
qw_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(svga_SOURCES)
qw_client_svga_LDADD= $(SVGA_LIBS) $(CLIENT_LIBS)
qw_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
qw_client_svga_LDADD= $(SVGA_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsvga.la
qw_client_svga_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# ... X11
#
x11_SOURCES= context_x11.c dga_check.c in_x11.c vid_common_sw.c vid_x11.c
qw_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(x11_SOURCES)
qw_client_x11_LDADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) $(CLIENT_LIBS)
qw_client_x11_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
qw_client_x11_LDADD= $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(X_SHM_LIB) $(CLIENT_LIBS) ../../libs/video/targets/libQFx11.la
qw_client_x11_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# OpenGL-using clients
#
# ... Common stuff
#
ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \
gl_dyn_part.c gl_dyn_textures.c gl_mesh.c gl_ngraph.c \
gl_rlight.c gl_rmain.c gl_rmisc.c gl_rsurf.c \
@ -205,46 +165,28 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \
gl_warp.c gl_model_alias.c gl_model_brush.c \
gl_model_fullbright.c gl_model_sprite.c qfgl_ext.c
#
# ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL
#
tdfx_SOURCES= vid_3dfxsvga.c vid_common_gl.c in_svgalib.c
qw_client_3dfx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(tdfx_SOURCES)
qw_client_3dfx_LDADD= $(TDFXGL_LIBS) $(SVGA_LIBS) $(CLIENT_LIBS) $(DL_LIBS)
qw_client_3dfx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES)
qw_client_3dfx_LDADD= $(TDFXGL_LIBS) $(SVGA_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFtdfx.la
qw_client_3dfx_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# ... OpenGL in X Window
#
glx_SOURCES= vid_glx.c vid_common_gl.c in_x11.c context_x11.c dga_check.c
qw_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(glx_SOURCES)
qw_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(CLIENT_LIBS) $(DL_LIBS)
qw_client_glx_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES)
qw_client_glx_LDADD= $(GLX_LIBS) $(X_PRE_LIBS) $(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 $(X_EXTRA_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFglx.la
qw_client_glx_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# ... Sam Lantinga's Simple DirectMedia Layer, version 1.1 and higher, in GL mode
#
sgl_SOURCES= vid_sgl.c vid_common_gl.c in_sdl.c
qw_client_sgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(sgl_SOURCES)
qw_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(CLIENT_LIBS) $(DL_LIBS)
# ... Simple DirectMedia Layer, version 1.1 and higher, in GL mode
qw_client_sgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES)
qw_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(CLIENT_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la
qw_client_sgl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# SGI/Microsoft WGL (Windows OpenGL)
#
wgl_SOURCES= vid_wgl.c vid_common_gl.c
qw_client_wgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES) $(wgl_SOURCES) in_win.c
qw_client_wgl_LDADD= $(CLIENT_LIBS) $(GLX_LIBS) -lgdi32
# ... SGI/Microsoft WGL (Windows OpenGL)
qw_client_wgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES)
qw_client_wgl_LDADD= $(CLIENT_LIBS) $(GLX_LIBS) ../../libs/video/targets/libQFwgl.la -lgdi32
qw_client_wgl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
#
# Stuff that doesn't get linked into an executable NEEDS to be mentioned here,
# or it won't be distributed with 'make dist'
#
EXTRA_DIST= makefile.mgw makefile.win \
qf-server.mak qw_server.dsp \
qf-client-sdl.mak qf-client-win.mak qw_client.dsp \