From 335195b53f17a10c87a78be213e6ef820ae32fb5 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 13 Oct 2019 23:53:26 +0200 Subject: [PATCH] Make shaders fixes (#5730) * Actually honor VERBOSE setting * Current shaders build setup is not capable of parallel build --- src/osd/modules/render/bgfx/shaders/makefile | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/osd/modules/render/bgfx/shaders/makefile b/src/osd/modules/render/bgfx/shaders/makefile index 7a058e7810f..c998f2564d9 100644 --- a/src/osd/modules/render/bgfx/shaders/makefile +++ b/src/osd/modules/render/bgfx/shaders/makefile @@ -12,27 +12,28 @@ SUBDIRS := $(patsubst .,,$(patsubst ./,,$(shell find . -type d))) rebuild: main $(SUBDIRS) endif +.NOTPARALLEL: $(SUBDIRS): @echo $@ ifeq ($(OS),windows) - $(SILENT) $(MAKE) -s --no-print-directory TARGET=0 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=1 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=0 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=1 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" endif - $(SILENT) $(MAKE) -s --no-print-directory TARGET=2 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=3 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=4 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=5 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=7 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=2 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=3 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=4 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=5 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=7 SHADERS_DIR=$@/ clean all SILENT="$(SILENT)" main: ifeq ($(OS),windows) - $(SILENT) $(MAKE) -s --no-print-directory TARGET=0 clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=1 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=0 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=1 clean all SILENT="$(SILENT)" endif - $(SILENT) $(MAKE) -s --no-print-directory TARGET=2 clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=3 clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=4 clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=5 clean all SILENT="$(SILENT)" - $(SILENT) $(MAKE) -s --no-print-directory TARGET=7 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=2 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=3 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=4 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=5 clean all SILENT="$(SILENT)" + $(SILENT) $(MAKE) --no-print-directory TARGET=7 clean all SILENT="$(SILENT)" .PHONY: main rebuild $(SUBDIRS)