From 669f9a65009276f2cc8dca1d6950034b8996e307 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Fri, 26 Mar 2021 15:17:46 +0900 Subject: [PATCH] Revert "[build] Clean up obsolete QF_PROCESS_NEED_DIRS" This reverts commit 22c0bec03a9017529e63467d8769cb32612fe6ae. It turns out to have been a critical part of selective build control. --- config.d/build_control.m4 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config.d/build_control.m4 b/config.d/build_control.m4 index 3094a69a6..4151e42c4 100644 --- a/config.d/build_control.m4 +++ b/config.d/build_control.m4 @@ -269,8 +269,13 @@ fi 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_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_DIRS(ruamoko,[qwaq]) + if test "$ENABLE_tools_qfcc" = "yes" -a "$ENABLE_tools_pak" = "yes"; then QF_NEED(top, [ruamoko]) qfac_qfcc_include_qf="\$(qfcc_include_qf)" @@ -298,8 +303,11 @@ if test "$HAVE_ZLIB" = "yes"; then fi QF_SUBST(progs_gz) +QF_PROCESS_NEED_DIRS(top, [libs hw nq qtv qw tools ruamoko]) + QF_PROCESS_NEED_LIBS(swrend, [asm]) 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_LIBS(models, [gl glsl sw vulkan], [libs/models]) QF_PROCESS_NEED_LIBS(alias, [gl glsl sw vulkan], [libs/models/alias]) QF_PROCESS_NEED_LIBS(brush, [gl glsl sw vulkan], [libs/models/brush])