qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

--disable-static now works (thanks for the heads-up, raorn)

Browse source
This commit is contained in:
Bill Currie 2003-12-22 20:51:08 +00:00
parent 069ee8657f
commit e53967b346
11 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -1878,8 +1878,14 @@ else
PREFER_PIC=-prefer-pic
PREFER_NON_PIC=-prefer-non-pic
fi
if test "x$enable_static" = xno; then
STATIC=
else
STATIC=-static
fi
AC_SUBST(PREFER_PIC)
AC_SUBST(PREFER_NON_PIC)
AC_SUBST(STATIC)
AC_ARG_WITH(static-plugins,
[ --with-static-plugins build plugins into executable rather than separate],

4
libs/net/Makefile.am
View file

@ -7,11 +7,11 @@ INCLUDES= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libnet_chan.la libnet_main.la
libnet_chan_la_LIBADD= nc/libnc.la
libnet_chan_la_LDFLAGS= -static
libnet_chan_la_LDFLAGS= @STATIC@
libnet_chan_la_SOURCES= net_chan.c
libnet_chan_la_DEPENDENCIES= nc/libnc.la
libnet_main_la_LIBADD= nm/libnm.la
libnet_main_la_LDFLAGS= -static
libnet_main_la_LDFLAGS= @STATIC@
libnet_main_la_SOURCES= net_main.c
libnet_main_la_DEPENDENCIES= nm/libnm.la

2
libs/net/nc/Makefile.am
View file

@ -13,5 +13,5 @@ else
ipvX_src= $(ipv4_src)
endif
libnc_la_SOURCES= $(ipvX_src)
libnc_la_LDFLAGS= -static
libnc_la_LDFLAGS= @STATIC@
EXTRA_libnc_la_SOURCES= $(ipv4_src) $(ipv6_src)

2
libs/net/nm/Makefile.am
View file

@ -11,7 +11,7 @@ else
net_sources= net_bsd.c net_udp.c
endif
libnm_la_SOURCES= net_dgrm.c net_loop.c net_vcr.c $(net_sources)
libnm_la_LDFLAGS= -static
libnm_la_LDFLAGS= @STATIC@
EXTRA_libnm_la_SOURCES= \

1
libs/util/Makefile.am
View file

@ -1,5 +1,6 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
AM_CCASFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFutil.la

2
libs/video/renderer/Makefile.am
View file

@ -17,7 +17,7 @@ libQFrenderer_gl_la_LIBADD= gl/libgl.la
libQFrenderer_gl_la_SOURCES= $(common_sources)
libQFrenderer_gl_la_DEPENDENCIES= gl/libgl.la
libQFrenderer_sw_la_LDFLAGS= -static
libQFrenderer_sw_la_LDFLAGS= @STATIC@
libQFrenderer_sw_la_LIBADD= sw/libsw.la
libQFrenderer_sw_la_SOURCES= $(common_sources)
libQFrenderer_sw_la_DEPENDENCIES= sw/libsw.la

5
libs/video/renderer/sw/Makefile.am
View file

@ -1,6 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_NON_PIC@
AM_CCASFLAGS= @PREFER_NON_PIC@
INCLUDES= -I$(top_srcdir)/include
if ASM_ARCH
@ -27,10 +28,10 @@ sw_src= \
sw_redge.c sw_rmain.c sw_rmisc.c sw_rpart.c sw_rsky.c sw_rsprite.c \
sw_rsurf.c sw_skin.c
libasm_la_LDFLAGS= -static
libasm_la_LDFLAGS= @STATIC@
libasm_la_SOURCES= $(asm_src)
libsw_la_LDFLAGS= -static
libsw_la_LDFLAGS= @STATIC@
libsw_la_SOURCES= $(sw_src)
if ASM_ARCH
libsw_la_LIBADD= $(asm)

32
libs/video/targets/Makefile.am
View file

@ -42,31 +42,31 @@ EXTRA_libQFjs_la_SOURCES= $(joy_linux_src) $(joy_win_src) $(joy_null_src)
libvid_common_la_SOURCES= \
in_common.c in_event.c keys.c old_keys.c pr_keys.c vid.c
libvid_common_la_CFLAGS= @PREFER_NON_PIC@
libvid_common_la_LDFLAGS= -static
libvid_common_la_LDFLAGS= @STATIC@
libvid_sw_la_SOURCES= vid_common_sw.c
libvid_sw_la_CFLAGS= @PREFER_NON_PIC@
libvid_sw_la_LDFLAGS= -static
libvid_sw_la_LDFLAGS= @STATIC@
libvid_sw32_la_SOURCES= vid_common_sw32.c
libvid_sw32_la_CFLAGS= @PREFER_NON_PIC@
libvid_sw32_la_LDFLAGS= -static
libvid_sw32_la_LDFLAGS= @STATIC@
libvid_gl_la_SOURCES= vid_common_gl.c qfgl_ext.c vtxarray.c
libvid_gl_la_CFLAGS= @PREFER_NON_PIC@
libvid_gl_la_LDFLAGS= -static
libvid_gl_la_LDFLAGS= @STATIC@
libvid_x11_la_SOURCES= in_x11.c context_x11.c dga_check.c
libvid_x11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libvid_x11_la_LDFLAGS= -static
libvid_x11_la_LDFLAGS= @STATIC@
libvid_svga_la_SOURCES= in_svgalib.c
libvid_svga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libvid_svga_la_LDFLAGS= -static
libvid_svga_la_LDFLAGS= @STATIC@
libvid_sdl_la_SOURCES= in_sdl.c context_sdl.c
libvid_sdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libvid_sdl_la_LDFLAGS= -static
libvid_sdl_la_LDFLAGS= @STATIC@
#
# Linux FBdev
@ -79,7 +79,7 @@ YACCLEX_CLEANFILES= $(fbdev_c) $(fbdev_h)
libQFfbdev_la_CFLAGS= @PREFER_NON_PIC@
libQFfbdev_la_SOURCES= fbset.c fbset_modes_y.y fbset_modes_l.l \
in_fbdev.c vid_fbdev.c
libQFfbdev_la_LDFLAGS= -static
libQFfbdev_la_LDFLAGS= @STATIC@
libQFfbdev_la_LIBADD= libvid_common.la libvid_sw.la
libQFfbdev_la_DEPENDENCIES= libvid_common.la libvid_sw.la
@ -88,7 +88,7 @@ libQFfbdev_la_DEPENDENCIES= libvid_common.la libvid_sw.la
#
libQFglx_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libQFglx_la_SOURCES= vid_glx.c
libQFglx_la_LDFLAGS= -static
libQFglx_la_LDFLAGS= @STATIC@
libQFglx_la_LIBADD= libvid_common.la libvid_gl.la libvid_x11.la
libQFglx_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_x11.la
@ -97,19 +97,19 @@ libQFglx_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_x11.la
#
libQFsdl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libQFsdl_la_SOURCES= vid_sdl.c
libQFsdl_la_LDFLAGS= -static
libQFsdl_la_LDFLAGS= @STATIC@
libQFsdl_la_LIBADD= libvid_common.la libvid_sw.la libvid_sdl.la
libQFsdl_la_DEPENDENCIES= libvid_common.la libvid_sw.la libvid_sdl.la
libQFsdl32_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libQFsdl32_la_SOURCES= vid_sdl32.c
libQFsdl32_la_LDFLAGS= -static
libQFsdl32_la_LDFLAGS= @STATIC@
libQFsdl32_la_LIBADD= libvid_common.la libvid_sw32.la libvid_sdl.la
libQFsdl32_la_DEPENDENCIES= libvid_common.la libvid_sw32.la libvid_sdl.la
libQFsgl_la_CFLAGS= @PREFER_NON_PIC@ $(SDL_CFLAGS)
libQFsgl_la_SOURCES= vid_sgl.c
libQFsgl_la_LDFLAGS= -static
libQFsgl_la_LDFLAGS= @STATIC@
libQFsgl_la_LIBADD= libvid_common.la libvid_gl.la libvid_sdl.la
libQFsgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_sdl.la
@ -118,7 +118,7 @@ libQFsgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la libvid_sdl.la
#
libQFsvga_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libQFsvga_la_SOURCES= vid_svgalib.c
libQFsvga_la_LDFLAGS= -static
libQFsvga_la_LDFLAGS= @STATIC@
libQFsvga_la_LIBADD= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
libQFsvga_la_DEPENDENCIES= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
@ -127,7 +127,7 @@ libQFsvga_la_DEPENDENCIES= $(asm) libvid_common.la libvid_sw.la libvid_svga.la
#
libQFtdfx_la_CFLAGS= @PREFER_NON_PIC@ $(SVGA_CFLAGS)
libQFtdfx_la_SOURCES= vid_3dfxsvga.c
libQFtdfx_la_LDFLAGS= -static
libQFtdfx_la_LDFLAGS= @STATIC@
libQFtdfx_la_LIBADD= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
libQFtdfx_la_DEPENDENCIES= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
@ -136,7 +136,7 @@ libQFtdfx_la_DEPENDENCIES= $(asm) libvid_common.la libvid_gl.la libvid_svga.la
#
libQFwgl_la_CFLAGS= @PREFER_NON_PIC@ $(WGL_CFLAGS)
libQFwgl_la_SOURCES= in_win.c vid_wgl.c
libQFwgl_la_LDFLAGS= -static
libQFwgl_la_LDFLAGS= @STATIC@
libQFwgl_la_LIBADD= libvid_common.la libvid_gl.la
libQFwgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la
@ -145,7 +145,7 @@ libQFwgl_la_DEPENDENCIES= libvid_common.la libvid_gl.la
#
libQFx11_la_CFLAGS= @PREFER_NON_PIC@ $(X_CFLAGS)
libQFx11_la_SOURCES= vid_x11.c
libQFx11_la_LDFLAGS= -static
libQFx11_la_LDFLAGS= @STATIC@
libQFx11_la_LIBADD= libvid_common.la libvid_sw.la libvid_x11.la
libQFx11_la_DEPENDENCIES= libvid_common.la libvid_sw.la libvid_x11.la

1
nq/source/Makefile.am
View file

@ -48,6 +48,7 @@ noinst_LIBRARIES= @nq_libs@ $(asm)
EXTRA_LIBRARIES=libasm.a libnq_client.a libnq_common.a libnq_sdl.a libnq_server.a
libasm_a_SOURCES= worlda.S
libasm_la_CCASFLAGS=@PREFER_NON_PIC@
libnq_common_a_SOURCES=game.c world.c com.c
libnq_sdl_a_SOURCES= sys_sdl.c
libnq_sdl_a_CFLAGS= $(SDL_CFLAGS)

1
qw/include/server.h
View file

@ -562,6 +562,7 @@ typedef enum {
void SV_BeginRedirect (redirect_t rd);
void SV_EndRedirect (void);
extern redirect_t sv_redirected;
extern struct dstring_s outputbuf;
//
// sv_ccmds.c

3
qw/source/Makefile.am
View file

@ -50,6 +50,7 @@ EXTRA_LIBRARIES=libasm.a libqw_client.a libqw_common.a libqw_sdl.a libqw_server.
libasm_a_SOURCES= worlda.S
libasm_la_CCASFLAGS=@PREFER_NON_PIC@
libqw_common_a_SOURCES= com.c game.c msg_ucmd.c pmove.c pmovetst.c net_packetlog.c
libqw_sdl_a_SOURCES=cl_sys_sdl.c
libqw_sdl_a_CFLAGS=$(SDL_CFLAGS)
@ -91,7 +92,7 @@ qw_server_DEPENDENCIES= libqw_common.a libqw_server.a libasm.a $(qf_server_LIBS)
qw_master_SOURCES= master.c
qw_master_LDADD= $(top_builddir)/libs/util/libQFutil.la $(NET_LIBS)
qw_master_LDFLAGS= $(common_ldflags) -static
qw_master_LDFLAGS= $(common_ldflags)
cl_plugin_LIBS= \
$(CLIENT_PLUGIN_STATIC_LIBS) \