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

Create and use QF_PROCESS_NEED_DIRS.

Browse source 
Not that I imagine many people use --with[out]-tools, but now unwanted
tools don't get visited by make.
This commit is contained in:
Bill Currie 2012-02-10 01:49:45 +09:00
parent 717d5368de
commit 4d6ed605a9
4 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
config.d/build_control.m4
View file

@ -240,47 +240,45 @@ if test "x$ENABLE_servers_qw" = xyes; then
QF_NEED(console, [server])
fi
unset TOOLS_TARGETS
if test "x$ENABLE_tools_bsp2img" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS bsp2img"
QF_NEED(tools,[bsp2img])
fi
if test "x$ENABLE_tools_carne" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS carne"
fi
if test "x$ENABLE_tools_gsc" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS gsc"
QF_NEED(tools,[carne])
fi
if test "x$ENABLE_tools_pak" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS pak"
QF_NEED(tools,[pak])
fi
if test "x$ENABLE_tools_qfbsp" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qfbsp"
QF_NEED(tools,[qfbsp])
fi
if test "x$ENABLE_tools_qfcc" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qfcc"
QF_NEED(tools,[qfcc])
fi
if test "x$ENABLE_tools_qflight" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qflight"
QF_NEED(tools,[qflight])
fi
if test "x$ENABLE_tools_qflmp" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qflmp"
QF_NEED(tools,[qflmp])
fi
if test "x$ENABLE_tools_qfmodelgen" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qfmodelgen"
QF_NEED(tools,[qfmodelgen])
fi
if test "x$ENABLE_tools_qfvis" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qfvis"
QF_NEED(tools,[qfvis])
fi
if test "x$ENABLE_tools_qwaq" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS qwaq"
QF_NEED(tools,[qwaq])
fi
if test "x$ENABLE_tools_wad" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS wad"
QF_NEED(tools,[wad])
fi
if test "x$ENABLE_tools_wav" = xyes; then
TOOLS_TARGETS="$TOOLS_TARGETS wav"
QF_NEED(tools,[wav])
fi
QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfvis qwaq wad wav])
AM_CONDITIONAL(BUILD_BSP2IMG, test "$ENABLE_tools_bsp2img" = "yes")
AM_CONDITIONAL(BUILD_CARNE, test "$ENABLE_tools_carne" = "yes")
AM_CONDITIONAL(BUILD_PAK, test "$ENABLE_tools_pak" = "yes")

12
config.d/result.m4
View file

@ -2,14 +2,14 @@ AC_MSG_RESULT([
QuakeForge has been configured successfully.
Build type :$BUILD_TYPE
Server support :${SV_TARGETS- no}
Client support :${CL_TARGETS- no}
Tools support :${TOOLS_TARGETS- no}
Sound support :${SOUND_TYPES- no} ${SND_OUTPUT_DEFAULT}
CD Audio system :${CDTYPE- no} ${CD_DEFAULT}
Server support :${SV_TARGETS:- no}
Client support :${CL_TARGETS:- no}
Tools support :${tools_dirs:- no}
Sound support :${SOUND_TYPES:- no} ${SND_OUTPUT_DEFAULT}
CD Audio system :${CDTYPE:- no} ${CD_DEFAULT}
IPv6 networking : $NETTYPE_IPV6
Compression support: gz=$HAVE_ZLIB ogg=$HAVE_VORBIS flac=$HAVE_FLAC png=$HAVE_PNG
HTTP support : ${CURL-no}
HTTP support : ${CURL:-no}
Compiler version : $CCVER
Compiler flags : $CFLAGS
qfcc cpp invocation: $CPP_NAME

4
m4/quakeforge.m4
View file

@ -112,6 +112,10 @@ qfn_ext=${qfn_ext:-la}
QF_PROCESS_NEED_subroutin([lib],[$1],[.${qfn_ext}],[libs],[$2])
])
AC_DEFUN([QF_PROCESS_NEED_DIRS], [
QF_PROCESS_NEED_subroutin([],[$1],[],[dirs],[$2])
])
AC_DEFUN([QF_WITH_TARGETS], [
AC_ARG_WITH($1,
[$2]

3
tools/Makefile.am
View file

@ -1 +1,2 @@
SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfvis qwaq wad wav
SUBDIRS=@tools_dirs@
DIST_SUBDIRS=bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfvis qwaq wad wav