From b80710c86815aa2027d97361eb33a4b0ca05d952 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Tue, 8 Nov 2016 18:17:54 +0100 Subject: [PATCH] Make shaders compile dx9 and dx11 only on windows (nw) --- src/osd/modules/render/bgfx/shaders/makefile | 4 ++++ src/osd/modules/render/bgfx/shaders/shader.mk | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/osd/modules/render/bgfx/shaders/makefile b/src/osd/modules/render/bgfx/shaders/makefile index b0f955fe03e..792ef5647fd 100644 --- a/src/osd/modules/render/bgfx/shaders/makefile +++ b/src/osd/modules/render/bgfx/shaders/makefile @@ -14,16 +14,20 @@ endif $(SUBDIRS): @echo $@ +ifeq ($(OS),windows) @make -s --no-print-directory TARGET=0 SHADERS_DIR=$@/ clean all @make -s --no-print-directory TARGET=1 SHADERS_DIR=$@/ clean all +endif @make -s --no-print-directory TARGET=2 SHADERS_DIR=$@/ clean all @make -s --no-print-directory TARGET=3 SHADERS_DIR=$@/ clean all @make -s --no-print-directory TARGET=4 SHADERS_DIR=$@/ clean all @make -s --no-print-directory TARGET=5 SHADERS_DIR=$@/ clean all main: +ifeq ($(OS),windows) @make -s --no-print-directory TARGET=0 clean all @make -s --no-print-directory TARGET=1 clean all +endif @make -s --no-print-directory TARGET=2 clean all @make -s --no-print-directory TARGET=3 clean all @make -s --no-print-directory TARGET=4 clean all diff --git a/src/osd/modules/render/bgfx/shaders/shader.mk b/src/osd/modules/render/bgfx/shaders/shader.mk index 89c13a1b867..8f73be5445c 100644 --- a/src/osd/modules/render/bgfx/shaders/shader.mk +++ b/src/osd/modules/render/bgfx/shaders/shader.mk @@ -85,9 +85,9 @@ endif endif THISDIR := $(dir $(lastword $(MAKEFILE_LIST))) -VS_FLAGS+=-i $(THISDIR)../src/;$(THISDIR)../examples/common/ -FS_FLAGS+=-i $(THISDIR)../src/;$(THISDIR)../examples/common/ -CS_FLAGS+=-i $(THISDIR)../src/$(THISDIR)../examples/common/ +VS_FLAGS+=-i "$(THISDIR)../src/;$(THISDIR)../examples/common/" +FS_FLAGS+=-i "$(THISDIR)../src/;$(THISDIR)../examples/common/" +CS_FLAGS+=-i "$(THISDIR)../src/;$(THISDIR)../examples/common/" BUILD_OUTPUT_DIR=$(addprefix ./, $(RUNTIME_DIR)/$(SHADER_PATH)) BUILD_INTERMEDIATE_DIR=$(addprefix $(BUILD_DIR)/, $(SHADER_PATH))