mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-18 06:51:47 +00:00
Shared library support. The util and gamecode libraries are now shared,
and this clears the way for an external API for utilities and such. And yes, this means libtool is now used.
This commit is contained in:
parent
a23c5e82e0
commit
277c17cfd8
11 changed files with 43 additions and 33 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -9,3 +9,4 @@ config.log
|
|||
config.status
|
||||
configure
|
||||
configure-stamp
|
||||
libtool
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
#!/bin/sh
|
||||
aclocal && autoheader && automake --add-missing && autoconf
|
||||
aclocal && autoheader && libtoolize --automake && automake --add-missing && autoconf
|
||||
|
|
|
@ -59,7 +59,7 @@ AC_PROG_INSTALL
|
|||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_RANLIB
|
||||
AM_PROG_LIBTOOL
|
||||
AM_PROG_LEX
|
||||
AC_PROG_YACC
|
||||
|
||||
|
|
6
libs/gamecode/.gitignore
vendored
6
libs/gamecode/.gitignore
vendored
|
@ -1,4 +1,8 @@
|
|||
*.la
|
||||
*.lo
|
||||
.deps
|
||||
.libs
|
||||
.vimrc
|
||||
Makefile.in
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
noinst_LIBRARIES = libqfgamecode.a
|
||||
lib_LTLIBRARIES = libQFgamecode.la
|
||||
|
||||
libqfgamecode_a_SOURCES = pr_edict.c pr_exec.c pr_strings.c
|
||||
libQFgamecode_la_LDFLAGS = -version-info 1:0:0
|
||||
libQFgamecode_la_SOURCES = pr_edict.c pr_exec.c pr_strings.c
|
||||
|
||||
all-local: ../libqfgamecode.a
|
||||
|
||||
../libqfgamecode.a: libqfgamecode.a
|
||||
cp $(noinst_LIBRARIES) ..
|
||||
LIBLIST = libQFgamecode.la @LIBRARY_SEARCH_PATH@
|
||||
|
|
9
libs/util/.gitignore
vendored
9
libs/util/.gitignore
vendored
|
@ -1,4 +1,7 @@
|
|||
.vimrc
|
||||
Makefile.in
|
||||
Makefile
|
||||
*.la
|
||||
*.lo
|
||||
.deps
|
||||
.libs
|
||||
.vimrc
|
||||
Makefile
|
||||
Makefile.in
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
noinst_LIBRARIES = libqfutil.a
|
||||
lib_LTLIBRARIES = libQFutil.la
|
||||
|
||||
libqfutil_a_SOURCES = checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c zone.c
|
||||
libQFutil_la_LDFLAGS = -version-info 1:0:0
|
||||
libQFutil_la_SOURCES = \
|
||||
checksum.c cmd.c crc.c cvar.c hash.c info.c link.c math.S mathlib.c \
|
||||
mdfour.c msg.c qargs.c qendian.c qfplist.c sizebuf.c va.c ver_check.c \
|
||||
zone.c
|
||||
|
||||
all-local: ../libqfutil.a
|
||||
|
||||
../libqfutil.a: libqfutil.a
|
||||
cp $(noinst_LIBRARIES) ..
|
||||
LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@
|
||||
|
|
13
nq/source/.gitignore
vendored
13
nq/source/.gitignore
vendored
|
@ -1,16 +1,17 @@
|
|||
.vimrc
|
||||
*.a
|
||||
*.d
|
||||
*.o
|
||||
*.obj
|
||||
.deps
|
||||
.libs
|
||||
.vimrc
|
||||
Makefile
|
||||
Makefile.in
|
||||
nq-3dfx
|
||||
nq-glx
|
||||
nq-sdl
|
||||
nq-svga
|
||||
nq-x11
|
||||
nq-3dfx
|
||||
nq-sgl
|
||||
nq.exe
|
||||
nq-svga
|
||||
nq-wgl.exe
|
||||
.deps
|
||||
nq-x11
|
||||
nq.exe
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#
|
||||
# $Id$
|
||||
#
|
||||
AUTOMAKE_OPTIONS= foreign
|
||||
|
||||
#
|
||||
# Stuff that is common to both client and server
|
||||
|
@ -128,8 +129,8 @@ libqfnet_a_SOURCES= net_bsd.c net_dgrm.c net_loop.c \
|
|||
EXTRA_libqfcd_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= -L. -L../../libs -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet -lqfgamecode -lqfutil $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
|
||||
client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a ../../libs/libqfgamecode.a ../../libs/libqfutil.a
|
||||
client_LIBS= $(top_builddir)/libs/gamecode/libQFgamecode.la $(top_builddir)/libs/util/libQFutil.la -L. -lqfsys -lqfsnd -lqfcd -lqfjs -lqfnet $(SOUND_LIBS) $(NET_LIBS) $(Z_LIBS)
|
||||
client_LIB_DEPS= libqfsys.a libqfsnd.a libqfcd.a libqfjs.a libqfnet.a
|
||||
|
||||
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 \
|
||||
|
|
7
qw/source/.gitignore
vendored
7
qw/source/.gitignore
vendored
|
@ -5,10 +5,14 @@
|
|||
*.obj
|
||||
*.s
|
||||
.deps
|
||||
.libs
|
||||
.vimrc
|
||||
Makefile
|
||||
Makefile.in
|
||||
client.exe
|
||||
fbset_modes_l.c
|
||||
fbset_modes_y.c
|
||||
fbset_modes_y.h
|
||||
qw-client-3dfx
|
||||
qw-client-3dfx.exe
|
||||
qw-client-fbdev
|
||||
|
@ -24,6 +28,3 @@ qw-client-x11
|
|||
qw-client-x11.exe
|
||||
qw-server
|
||||
qw-server.exe
|
||||
fbset_modes_y.c
|
||||
fbset_modes_y.h
|
||||
fbset_modes_l.c
|
||||
|
|
|
@ -86,8 +86,8 @@ server_SOURCES= sv_ccmds.c sv_cvar.c \
|
|||
sv_user.c world.c $(world_ASM)
|
||||
|
||||
qw_server_SOURCES= $(common_SOURCES) $(server_SOURCES)
|
||||
qw_server_LDADD= -L. -L../../libs -lqfnet -lqfsys_sv -lqfgamecode -lqfutil $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
|
||||
qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a ../../libs/libqfgamecode.a ../../libs/libqfutil.a
|
||||
qw_server_LDADD= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_sv $(NET_LIBS) $(Z_LIBS) $(DL_LIBS)
|
||||
qw_server_DEPENDENCIES= libqfnet.a libqfsys_sv.a
|
||||
|
||||
#
|
||||
# Client builds
|
||||
|
@ -170,8 +170,8 @@ endif
|
|||
libqfjs_a_CFLAGS= $(JOY_CFLAGS)
|
||||
EXTRA_libqfjs_a_SOURCES= joy_linux.c joy_win.c joy_null.c
|
||||
|
||||
CLIENT_LIBS= -L. -L../../libs -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs -lqfgamecode -lqfutil $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
|
||||
CLIENT_LIB_DEPS= libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a ../../libs/libqfgamecode.a ../../libs/libqfutil.a
|
||||
CLIENT_LIBS= $(top_builddir)/libs/util/libQFutil.la $(top_builddir)/libs/gamecode/libQFgamecode.la -L. -lqfnet -lqfsys_cl -lqfsnd -lqfcd -lqfjs $(SOUND_LIBS) $(NET_LIBS) $(CD_LIBS) $(JOY_LIBS) $(Z_LIBS)
|
||||
CLIENT_LIB_DEPS= libqfnet.a libqfsys_cl.a libqfsnd.a libqfcd.a libqfjs.a
|
||||
|
||||
if ASM_ARCH
|
||||
client_ASM= snd_mixa.S cl_math.S
|
||||
|
|
Loading…
Reference in a new issue