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

[build] Rename QF_PROCESS_NEED_DIRS

Browse source 
QF_PROCESS_NEED_LIST is a better name as for one, building no longer
depends on directories, and the directories were lists anyway, so the
name is more generally applicable.
This commit is contained in:
Bill Currie 2021-03-26 15:26:13 +09:00
parent 669f9a6500
commit 7dc7bf138f
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config.d/build_control.m4
View file

@ -269,12 +269,12 @@ fi
QF_NEED(top, [libs hw nq qtv qw]) QF_NEED(top, [libs hw nq qtv qw])
QF_PROCESS_NEED_DIRS(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav]) QF_PROCESS_NEED_LIST(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav])
QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav], QF_NEED(top,tools)) QF_PROCESS_NEED_FUNC(tools,[bsp2img carne pak qfbsp qfcc qflight qflmp qfmodelgen qfspritegen qfvis wad wav], QF_NEED(top,tools))
QF_PROCESS_NEED_DIRS(libs,[util gamecode ruamoko gib audio image models video console net qw client]) QF_PROCESS_NEED_LIST(libs,[util gamecode ruamoko gib audio image models video console net qw client])
QF_PROCESS_NEED_DIRS(ruamoko,[qwaq]) QF_PROCESS_NEED_LIST(ruamoko,[qwaq])
if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then
QF_NEED(top, [ruamoko]) QF_NEED(top, [ruamoko])
@ -303,11 +303,11 @@ if test "$HAVE_ZLIB" = "yes"; then
fi fi
QF_SUBST(progs_gz) QF_SUBST(progs_gz)
QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko]) QF_PROCESS_NEED_LIST(top, [libs hw nq qtv qw tools ruamoko])
QF_PROCESS_NEED_LIBS(swrend, [asm]) QF_PROCESS_NEED_LIBS(swrend, [asm])
QF_PROCESS_NEED_LIBS(render, [gl glsl sw sw32 vulkan], [libs/video/renderer]) QF_PROCESS_NEED_LIBS(render, [gl glsl sw sw32 vulkan], [libs/video/renderer])
QF_PROCESS_NEED_DIRS(vid_render, [gl glsl sw sw32 vulkan]) QF_PROCESS_NEED_LIST(vid_render, [gl glsl sw sw32 vulkan])
QF_PROCESS_NEED_LIBS(models, [gl glsl sw vulkan], [libs/models]) QF_PROCESS_NEED_LIBS(models, [gl glsl sw vulkan], [libs/models])
QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias]) QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias])
QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush]) QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush])

2
config.d/result.m4
View file

@ -4,7 +4,7 @@ AC_MSG_RESULT([
Build type :$BUILD_TYPE Build type :$BUILD_TYPE
Server support :${SV_TARGETS:- no} Server support :${SV_TARGETS:- no}
Client support :${CL_TARGETS:- no} Client support :${CL_TARGETS:- no}
Tools support :${tools_dirs:- no} Tools support :${tools_list:- no}
Sound support :${SOUND_TYPES:- no} ${snd_output_default} Sound support :${SOUND_TYPES:- no} ${snd_output_default}
CD Audio system :${CDTYPE:- no} ${cd_default} CD Audio system :${CDTYPE:- no} ${cd_default}
IPv6 networking : $NETTYPE_IPV6 IPv6 networking : $NETTYPE_IPV6

6
m4/quakeforge.m4
View file

@ -109,9 +109,9 @@ AC_DEFUN([QF_PROCESS_NEED_LIBS],
QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2],[$3]) QF_PROCESS_NEED_subroutine([lib$1_],[$1],[.]qfn_ext,[$1_libs],[$2],[$3])
QF_SUBST([$1_libs])]) QF_SUBST([$1_libs])])
AC_DEFUN([QF_PROCESS_NEED_DIRS], AC_DEFUN([QF_PROCESS_NEED_LIST],
[QF_PROCESS_NEED_subroutine([],[$1],[],[$1_dirs],[$2]) [QF_PROCESS_NEED_subroutine([],[$1],[],[$1_list],[$2])
QF_SUBST([$1_dirs])]) QF_SUBST([$1_list])])
AC_DEFUN([QF_DEFAULT_PLUGIN], AC_DEFUN([QF_DEFAULT_PLUGIN],
[m4_define([qfn_default], m4_default($3,$1)[_default]) [m4_define([qfn_default], m4_default($3,$1)[_default])