Small cleanups.
This commit is contained in:
Ragnvald Maartmann-Moe IV
parent
4be4e5ccf6
commit
b5d3508022
|
|
@ -31,7 +31,7 @@ AUTOMAKE_OPTIONS= foreign
|
|||
|
||||
# Stuff that is common to both client and server
|
||||
#
|
||||
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLX_CFLAGS) $(TDFXGL_CFLAGS)
|
||||
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include
|
||||
|
||||
bin_PROGRAMS = @NQ_TARGETS@
|
||||
|
||||
|
|
@ -65,24 +65,24 @@ libqfnet_a_SOURCES= net_bsd.c net_dgrm.c net_loop.c \
|
|||
EXTRA_libqfnet_a_SOURCES=net_dos.c net_bw.c net_ipx.c net_mp.c net_ser.c \
|
||||
net_win.c net_wins.c net_wipx.c
|
||||
|
||||
client_LIBS= $(top_builddir)/libs/gamecode/libQFgamecode.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la \
|
||||
$(top_builddir)/libs/audio/cd/libQFcd.la \
|
||||
$(top_builddir)/libs/audio/targets/libQFsound.la \
|
||||
-L. -lqfnet $(SOUND_LIBS) $(NET_LIBS)
|
||||
client_LIB_DEPS= libqfnet.a
|
||||
client_POST_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la
|
||||
client_LIBS= $(top_builddir)/libs/gamecode/libQFgamecode.la \
|
||||
$(top_builddir)/libs/util/libQFutil.la \
|
||||
$(top_builddir)/libs/audio/cd/libQFcd.la \
|
||||
$(top_builddir)/libs/audio/targets/libQFsound.la \
|
||||
-L. -lqfnet $(SOUND_LIBS) $(NET_LIBS)
|
||||
client_LIB_DEPS= libqfnet.a
|
||||
client_POST_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la
|
||||
|
||||
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
|
||||
client_SOURCES= cl_cam.c cl_cmd.c cl_demo.c cl_input.c cl_main.c cl_parse.c \
|
||||
cl_tent.c console.c keys.c sbar.c r_part.c r_view.c \
|
||||
nonintel.c gib.c gib_instructions.c gib_vars.c \
|
||||
gib_interpret.c gib_modules.c gib_parse.c gib_stack.c
|
||||
|
||||
server_SOURCES= host.c host_cmd.c \
|
||||
pr_cmds.c \
|
||||
sv_cvar.c sv_main.c sv_move.c sv_phys.c sv_progs.c sv_user.c
|
||||
server_SOURCES= host.c host_cmd.c pr_cmds.c sv_cvar.c sv_main.c \
|
||||
sv_move.c sv_phys.c sv_progs.c sv_user.c
|
||||
|
||||
combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES) $(qfsys_SRC)
|
||||
combined_SOURCES= $(common_SOURCES) $(client_SOURCES) $(server_SOURCES) \
|
||||
$(qfsys_SRC)
|
||||
|
||||
# Software-rendering targets
|
||||
#
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ AUTOMAKE_OPTIONS= foreign
|
|||
# Stuff that is common to both client and server
|
||||
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include
|
||||
|
||||
bin_PROGRAMS = @QW_TARGETS@
|
||||
bin_PROGRAMS= @QW_TARGETS@
|
||||
|
||||
EXTRA_PROGRAMS= qw-client-3dfx qw-client-fbdev \
|
||||
qw-client-glx qw-client-mgl qw-client-sdl \
|
||||
|
|
@ -42,9 +42,9 @@ EXTRA_PROGRAMS= qw-client-3dfx qw-client-fbdev \
|
|||
noinst_LIBRARIES= libqfnet.a
|
||||
|
||||
common_SOURCES= buildnum.c com.c \
|
||||
game.c model.c model_brush.c msg_ucmd.c \
|
||||
pmove.c pmovetst.c \
|
||||
sys_x86.S net_packetlog.c
|
||||
game.c model.c model_brush.c msg_ucmd.c \
|
||||
pmove.c pmovetst.c \
|
||||
sys_x86.S net_packetlog.c
|
||||
|
||||
# ... Network type
|
||||
if NETTYPE_IPV6
|
||||
|
|
@ -83,14 +83,13 @@ else
|
|||
syscl_SRC= cl_sys_unix.c
|
||||
endif
|
||||
|
||||
CLIENT_LIBS= $(top_builddir)/libs/util/libQFutil.la \
|
||||
client_LIBS= $(top_builddir)/libs/util/libQFutil.la \
|
||||
$(top_builddir)/libs/gamecode/libQFgamecode.la \
|
||||
$(top_builddir)/libs/audio/cd/libQFcd.la \
|
||||
$(top_builddir)/libs/audio/targets/libQFsound.la \
|
||||
-L. -lqfnet \
|
||||
$(SOUND_LIBS) $(NET_LIBS)
|
||||
CLIENT_LIB_DEPS= libqfnet.a
|
||||
CLIENT_POST_LIBS=$(top_builddir)/libs/video/targets/libQFjs.la
|
||||
-L. -lqfnet $(SOUND_LIBS) $(NET_LIBS)
|
||||
client_LIB_DEPS= libqfnet.a
|
||||
client_POST_LIBS= $(top_builddir)/libs/video/targets/libQFjs.la
|
||||
# libQFjs is seperate because it needs to be linked after when building statically
|
||||
|
||||
client_SOURCES= cl_cam.c cl_cmd.c cl_cvar.c cl_demo.c cl_ents.c cl_input.c \
|
||||
|
|
@ -115,28 +114,28 @@ soft_SOURCES= d_edge.c d_fill.c d_init.c d_modech.c \
|
|||
|
||||
# ... Linux FBDev
|
||||
qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
|
||||
qw_client_fbdev_LDADD= $(CLIENT_LIBS) ../../libs/video/targets/libQFfbdev.la $(CLIENT_POST_LIBS)
|
||||
qw_client_fbdev_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_fbdev_LDADD= $(client_LIBS) ../../libs/video/targets/libQFfbdev.la $(client_POST_LIBS)
|
||||
qw_client_fbdev_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... SciTech MGL
|
||||
qw_client_mgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
|
||||
qw_client_mgl_LDADD= $(MGL_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFmgl.la $(CLIENT_POST_LIBS)
|
||||
qw_client_mgl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_mgl_LDADD= $(MGL_LIBS) $(client_LIBS) ../../libs/video/targets/libQFmgl.la $(client_POST_LIBS)
|
||||
qw_client_mgl_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... 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 $(CLIENT_POST_LIBS)
|
||||
qw_client_sdl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_sdl_LDADD= $(SDL_LIBS) $(client_LIBS) ../../libs/video/targets/libQFsdl.la $(client_POST_LIBS)
|
||||
qw_client_sdl_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... Linux SVGAlib
|
||||
qw_client_svga_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES)
|
||||
qw_client_svga_LDADD= $(SVGA_LIBS) $(CLIENT_LIBS) ../../libs/video/targets/libQFsvga.la $(CLIENT_POST_LIBS)
|
||||
qw_client_svga_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_svga_LDADD= $(SVGA_LIBS) $(client_LIBS) ../../libs/video/targets/libQFsvga.la $(client_POST_LIBS)
|
||||
qw_client_svga_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... X11
|
||||
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 $(CLIENT_POST_LIBS)
|
||||
qw_client_x11_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
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 $(client_POST_LIBS)
|
||||
qw_client_x11_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
|
||||
# OpenGL-using clients
|
||||
|
|
@ -151,23 +150,23 @@ ogl_SOURCES= noisetextures.c gl_textures.c gl_draw.c gl_dyn_fires.c \
|
|||
|
||||
# ... 3Dfx Voodoo 1 and 2 SVGAlib-based console GL
|
||||
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 $(CLIENT_POST_LIBS)
|
||||
qw_client_3dfx_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_3dfx_LDADD= $(TDFXGL_LIBS) $(SVGA_LIBS) $(client_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFtdfx.la $(client_POST_LIBS)
|
||||
qw_client_3dfx_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... OpenGL in X Window
|
||||
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 $(CLIENT_POST_LIBS)
|
||||
qw_client_glx_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
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 $(client_POST_LIBS)
|
||||
qw_client_glx_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... 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 $(CLIENT_POST_LIBS)
|
||||
qw_client_sgl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_sgl_LDADD= $(SDL_LIBS) $(X_LIBS) $(GLX_LIBS) $(client_LIBS) $(DL_LIBS) ../../libs/video/targets/libQFsgl.la $(client_POST_LIBS)
|
||||
qw_client_sgl_DEPENDENCIES= $(client_LIB_DEPS)
|
||||
|
||||
# ... SGI/Microsoft WGL (Windows OpenGL)
|
||||
qw_client_wgl_SOURCES= $(common_SOURCES) $(client_SOURCES) $(ogl_SOURCES)
|
||||
qw_client_wgl_LDADD= $(CLIENT_LIBS) ../../libs/video/targets/libQFwgl.la $(CLIENT_POST_LIBS) $(GLX_LIBS) -lgdi32 -lwinmm
|
||||
qw_client_wgl_DEPENDENCIES= $(CLIENT_LIB_DEPS)
|
||||
qw_client_wgl_LDADD= $(client_LIBS) ../../libs/video/targets/libQFwgl.la $(client_POST_LIBS) $(GLX_LIBS) -lgdi32 -lwinmm
|
||||
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'
|
||||
|
|
|
|||
Loading…
Reference in New Issue