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

Aaaaaaand, it's done!

Browse source 
Special note: I hope to never do this again. :)
This commit is contained in:
Jeff Teunissen 2001-09-28 10:31:20 +00:00
parent 873521a68d
commit d63243380f
9 changed files with 73 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bootstrap
View file

@ -28,4 +28,4 @@ else
exit 1 exit 1
fi fi
aclocal && autoheader && libtoolize --automake && automake --add-missing && autoconf libtoolize --automake && automake --add-missing && aclocal && autoheader && autoconf

25
configure.ac
View file

@ -977,19 +977,19 @@ AC_DEFINE_UNQUOTED(FS_USERPATH, "$userpath")
AC_ARG_WITH(plugin-path, AC_ARG_WITH(plugin-path,
[ --with-plugin-path=DIR Use DIR for loading plugins, defaults to [ --with-plugin-path=DIR Use DIR for loading plugins, defaults to
\${libdir}/quakeforge], \${libdir}/quakeforge],
pluginpath=$withval, pluginpath="auto") plugindir=$withval, plugindir="auto")
PLUGINDIR="$libdir/$PACKAGE" PLUGINDIR="$libdir/$PACKAGE"
if test "x$pluginpath" = "xauto" -o "x$pluginpath" = "xyes" -o "x$pluginpath" = "x"; then if test "x$plugindir" = "xauto" -o "x$plugindir" = "xyes" -o "x$plugindir" = "x"; then
eval pluginpath="$PLUGINDIR" eval plugindir="$PLUGINDIR"
elif test "x$pluginpath" = xno; then elif test "x$plugindir" = xno; then
pluginpath="." plugindir="."
else else
PLUGINDIR=$pluginpath PLUGINDIR=$plugindir
eval pluginpath="$PLUGINDIR" eval plugindir="$PLUGINDIR"
fi fi
AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$pluginpath") AC_DEFINE_UNQUOTED(FS_PLUGINPATH, "$plugindir")
AC_SUBST(pluginpath) AC_SUBST(plugindir)
AC_SUBST(PLUGINDIR) AC_SUBST(PLUGINDIR)
dnl CFLAGS for release and devel versions dnl CFLAGS for release and devel versions
@ -1274,6 +1274,7 @@ CD_TARGETS=""
SND_PLUGIN_TARGETS="libsnd_output_disk.la" SND_PLUGIN_TARGETS="libsnd_output_disk.la"
SND_REND_TARGETS="" SND_REND_TARGETS=""
SND_TARGETS="" SND_TARGETS=""
VID_MODEL_TARGETS=""
VID_REND_TARGETS="" VID_REND_TARGETS=""
VID_TARGETS="" VID_TARGETS=""
VID_TARGETS_NOINST="" VID_TARGETS_NOINST=""
@ -1369,12 +1370,15 @@ fi
if test "x$BUILD_SW" = xyes; then if test "x$BUILD_SW" = xyes; then
VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la" VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw.la"
fi fi
if test "x$BUILD_SW32" = xyes; then if test "x$BUILD_SW32" = xyes; then
VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw32.la" VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_sw32.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_sw32.la"
fi fi
if test "x$BUILD_GL" = xyes; then if test "x$BUILD_GL" = xyes; then
VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_gl.la" VID_REND_TARGETS="$VID_REND_TARGETS libQFrenderer_gl.la"
VID_MODEL_TARGETS="$VID_MODEL_TARGETS libQFmodels_gl.la"
fi fi
AC_SUBST(CAN_BUILD_GL) AC_SUBST(CAN_BUILD_GL)
@ -1433,6 +1437,7 @@ AC_SUBST(CD_TARGETS)
AC_SUBST(SND_PLUGIN_TARGETS) AC_SUBST(SND_PLUGIN_TARGETS)
AC_SUBST(SND_REND_TARGETS) AC_SUBST(SND_REND_TARGETS)
AC_SUBST(SND_TARGETS) AC_SUBST(SND_TARGETS)
AC_SUBST(VID_MODEL_TARGETS)
AC_SUBST(VID_REND_TARGETS) AC_SUBST(VID_REND_TARGETS)
AC_SUBST(VID_TARGETS) AC_SUBST(VID_TARGETS)
AC_SUBST(VID_TARGETS_NOINST) AC_SUBST(VID_TARGETS_NOINST)
@ -1526,7 +1531,7 @@ AC_MSG_RESULT([
Shared game data directory: $sharepath Shared game data directory: $sharepath
Per-user game data directory: $userpath Per-user game data directory: $userpath
Plugin load directory: $pluginpath Plugin load directory: $plugindir
Global configuration file: $globalconf Global configuration file: $globalconf
User configuration file: $userconf User configuration file: $userconf
]) ])

14
libs/audio/cd/Makefile.am
View file

@ -1,23 +1,21 @@
INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS)
pkglibdir = @PLUGINDIR@ plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@
pkglib_LTLIBRARIES= @CD_PLUGIN_TARGETS@
EXTRA_LTLIBRARIES= libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la libcd_null.la EXTRA_LTLIBRARIES= libcd_linux.la libcd_sdl.la libcd_sgi.la libcd_win.la libcd_null.la
libcd_linux_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libcd_linux_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libcd_linux_la_SOURCES= cd_linux.c libcd_linux_la_SOURCES= cd_linux.c
libcd_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libcd_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libcd_sdl_la_LIBADD= $(SDL_LIBS) libcd_sdl_la_LIBADD= $(SDL_LIBS)
libcd_sdl_la_SOURCES= cd_sdl.c libcd_sdl_la_SOURCES= cd_sdl.c
libcd_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libcd_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libcd_sgi_la_LIBADD= $(SGI_CD_LIBS) libcd_sgi_la_LIBADD= $(SGI_CD_LIBS)
libcd_sgi_la_SOURCES= cd_sgi.c libcd_sgi_la_SOURCES= cd_sgi.c
libcd_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libcd_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libcd_win_la_SOURCES= cd_win.c libcd_win_la_SOURCES= cd_win.c
libcd_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libcd_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libcd_null_la_SOURCES= cd_null.c libcd_null_la_SOURCES= cd_null.c

6
libs/audio/renderer/Makefile.am
View file

@ -1,8 +1,6 @@
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
libdir= @PLUGINDIR@ plugin_LTLIBRARIES= @SND_REND_TARGETS@
lib_LTLIBRARIES= @SND_REND_TARGETS@
EXTRA_LTLIBRARIES= libsnd_render_default.la EXTRA_LTLIBRARIES= libsnd_render_default.la
noinst_LTLIBRARIES= libasm.la noinst_LTLIBRARIES= libasm.la
@ -12,7 +10,7 @@ else
libasm_la_SOURCES= libasm_la_SOURCES=
endif endif
libsnd_render_default_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_render_default_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_render_default_la_LIBADD= libasm.la libsnd_render_default_la_LIBADD= libasm.la
libsnd_render_default_la_DEPENDENCIES= libasm.la libsnd_render_default_la_DEPENDENCIES= libasm.la
libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c libsnd_render_default_la_SOURCES= snd_dma.c snd_mem.c snd_mix.c

22
libs/audio/targets/Makefile.am
View file

@ -1,39 +1,37 @@
INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS) INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS)
libdir = @PLUGINDIR@ plugin_LTLIBRARIES = @SND_PLUGIN_TARGETS@
lib_LTLIBRARIES = @SND_PLUGIN_TARGETS@
EXTRA_LTLIBRARIES = libsnd_output_sdl.la libsnd_output_alsa0_5.la libsnd_output_alsa0_9.la libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la EXTRA_LTLIBRARIES = libsnd_output_sdl.la libsnd_output_alsa0_5.la libsnd_output_alsa0_9.la libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la
libsnd_output_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_sdl_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_sdl_la_LIBADD= $(SDL_LIBS) libsnd_output_sdl_la_LIBADD= $(SDL_LIBS)
libsnd_output_sdl_la_SOURCES= snd_sdl.c libsnd_output_sdl_la_SOURCES= snd_sdl.c
libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_alsa0_5_la_LIBADD= $(ALSA_LIBS) libsnd_output_alsa0_5_la_LIBADD= $(ALSA_LIBS)
libsnd_output_alsa0_5_la_SOURCES= snd_alsa_0_5.c libsnd_output_alsa0_5_la_SOURCES= snd_alsa_0_5.c
libsnd_output_alsa0_9_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_alsa0_9_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_alsa0_9_la_LIBADD= $(ALSA_LIBS) libsnd_output_alsa0_9_la_LIBADD= $(ALSA_LIBS)
libsnd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c libsnd_output_alsa0_9_la_SOURCES= snd_alsa_0_9.c
libsnd_output_oss_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_oss_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_oss_la_LIBADD= $(OSS_LIBS) libsnd_output_oss_la_LIBADD= $(OSS_LIBS)
libsnd_output_oss_la_SOURCES= snd_oss.c libsnd_output_oss_la_SOURCES= snd_oss.c
libsnd_output_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_sgi_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_sgi_la_LIBADD= $(SGISND_LIBS) libsnd_output_sgi_la_LIBADD= $(SGISND_LIBS)
libsnd_output_sgi_la_SOURCES= snd_sgi.c libsnd_output_sgi_la_SOURCES= snd_sgi.c
libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_sun_la_SOURCES= snd_sun.c libsnd_output_sun_la_SOURCES= snd_sun.c
libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_win_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_win_la_LIBADD= $(WINSND_LIBS) libsnd_output_win_la_LIBADD= $(WINSND_LIBS)
libsnd_output_win_la_SOURCES= snd_win.c libsnd_output_win_la_SOURCES= snd_win.c
libsnd_output_disk_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_disk_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_disk_la_SOURCES= snd_disk.c libsnd_output_disk_la_SOURCES= snd_disk.c
libsnd_output_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(pluginpath) libsnd_output_null_la_LDFLAGS= -version-info 1:0:0 -rpath $(plugindir)
libsnd_output_null_la_SOURCES= snd_null.c libsnd_output_null_la_SOURCES= snd_null.c

33
libs/console/Makefile.am
View file

@ -1,27 +1,18 @@
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
pkglibdir = @PLUGINDIR@ lib_LTLIBRARIES= libQFconsole.la
plugin_LTLIBRARIES= libconsole_client.la libconsole_server.la
lib_LTLIBRARIES = libQFconsole.la common_sources= complete.c console.c inputline.c list.c
pkglib_LTLIBRARIES = libconsole_client.la libconsole_server.la client_sources= client.c
server_sources= server.c
common_sources = complete.c console.c inputline.c list.c libQFconsole_la_LDFLAGS= -version-info 1:0:0
client_sources = client.c libQFconsole_la_SOURCES= $(common_sources)
server_sources = server.c
libQFconsole_la_LDFLAGS = -version-info 1:0:0 libconsole_client_la_LDFLAGS= -version-info 1:0:0
libQFconsole_la_LIBADD = libconsole_client_la_SOURCES= $(client_sources)
libQFconsole_la_SOURCES = $(common_sources)
libQFconsole_la_DEPENDENCIES =
libconsole_client_la_LDFLAGS = -version-info 1:0:0 libconsole_server_la_LDFLAGS= -version-info 1:0:0
libconsole_client_la_LIBADD = libconsole_server_la_LIBADD= $(CURSES_LIBS)
libconsole_client_la_SOURCES = $(client_sources) libconsole_server_la_SOURCES= $(server_sources)
libconsole_client_la_DEPENDENCIES =
libconsole_server_la_LDFLAGS = -version-info 1:0:0
libconsole_server_la_LIBADD = $(CURSES_LIBS)
libconsole_server_la_SOURCES = $(server_sources)
libconsole_server_la_DEPENDENCIES =
LIBLIST = libQFconsole.la

8
libs/gamecode/builtins/Makefile.am
View file

@ -1,8 +1,6 @@
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFgamecode_builtins.la lib_LTLIBRARIES= libQFgamecode_builtins.la
libQFgamecode_builtins_la_LDFLAGS = -version-info 1:0:0 libQFgamecode_builtins_la_LDFLAGS= -version-info 1:0:0
libQFgamecode_builtins_la_SOURCES = pr_cmds.c libQFgamecode_builtins_la_SOURCES= pr_cmds.c
LIBLIST = libQFgamecode_builtins.la @LIBRARY_SEARCH_PATH@

9
libs/gamecode/engine/Makefile.am
View file

@ -1,8 +1,7 @@
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFgamecode.la lib_LTLIBRARIES= libQFgamecode.la
libQFgamecode_la_LDFLAGS = -version-info 1:0:0 libQFgamecode_la_LDFLAGS= -version-info 1:0:0
libQFgamecode_la_SOURCES = pr_edict.c pr_debug.c pr_exec.c pr_opcode.c pr_strings.c libQFgamecode_la_SOURCES= \
pr_edict.c pr_debug.c pr_exec.c pr_opcode.c pr_strings.c
LIBLIST = libQFgamecode.la @LIBRARY_SEARCH_PATH@

42
libs/util/Makefile.am
View file

@ -1,32 +1,30 @@
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFutil.la lib_LTLIBRARIES= libQFutil.la
if BUILD_FNMATCH noinst_LTLIBRARIES= libasm.la
fnmatch_SRC = fnmatch.c dirent.c
else
fnmatch_SRC =
endif
noinst_LTLIBRARIES = libasm.la
if ASM_ARCH if ASM_ARCH
libasm_la_SOURCES = math.S libasm_la_SOURCES= math.S
else else
libasm_la_SOURCES = libasm_la_SOURCES=
endif
EXTRA_libasm_la_SOURCES=math.S
if BUILD_FNMATCH
fnmatch_SRC= fnmatch.c dirent.c
else
fnmatch_SRC=
endif endif
libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) $(DL_LIBS) libQFutil_la_LDFLAGS= -version-info 1:0:0
libQFutil_la_LIBADD = libasm.la libQFutil_la_LIBADD= libasm.la $(Z_LIBS) $(DL_LIBS)
libQFutil_la_DEPENDENCIES = libasm.la libQFutil_la_DEPENDENCIES= libasm.la
libQFutil_la_SOURCES = \ libQFutil_la_SOURCES= \
checksum.c cmd.c console.c con_print.c crc.c cvar.c fendian.c hash.c \ checksum.c cmd.c console.c con_print.c crc.c cvar.c fendian.c hash.c \
info.c link.c \ info.c link.c mathlib.c mdfour.c msg.c pcx.c plugin.c qargs.c \
mathlib.c \ qendian.c qfplist.c quakefs.c quakeio.c sizebuf.c sys.c tga.c va.c \
mdfour.c msg.c pcx.c plugin.c qargs.c qendian.c qfplist.c quakefs.c \ ver_check.c wad.c zone.c $(fnmatch_SRC)
quakeio.c sizebuf.c sys.c tga.c va.c ver_check.c wad.c \
zone.c $(fnmatch_SRC)
LIBLIST = libQFutil.la @LIBRARY_SEARCH_PATH@ EXTRA_libQFutil_la_SOURCES= fnmatch.c dirent.c
EXTRA_DIST = fnmatch.c dirent.c