From 4470d977daeaa95543956c46f52afac1bf1ae905 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Tue, 15 Oct 2019 18:32:42 +0200 Subject: Unbreak building shaders in cmd shell and add support for building them in MINGW bash shell (#5740) --- 3rdparty/bgfx/scripts/tools.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/3rdparty/bgfx/scripts/tools.mk b/3rdparty/bgfx/scripts/tools.mk index d3ec6784b03..cc38aa8c759 100644 --- a/3rdparty/bgfx/scripts/tools.mk +++ b/3rdparty/bgfx/scripts/tools.mk @@ -9,16 +9,21 @@ THISDIR:=$(dir $(lastword $(MAKEFILE_LIST))) UNAME:=$(shell uname) ifeq ($(UNAME),$(filter $(UNAME),Linux Darwin)) -CMD_MKDIR=mkdir -p "$(1)" -CMD_RMDIR=rm -r "$(1)" +CMD_MKDIR=if [ ! -d "$(1)" ]; then mkdir -p "$(1)"; fi +CMD_RMDIR=if [ -d "$(1)" ]; then rm -r "$(1)"; fi ifeq ($(UNAME),$(filter $(UNAME),Darwin)) OS=darwin else OS=linux endif else -CMD_MKDIR=cmd //C "if not exist "$(subst /,\,$(1))" mkdir "$(subst /,\,$(1))"" -CMD_RMDIR=cmd //C "if exist "$(subst /,\,$(1))" rmdir /S /Q "$(subst /,\,$(1))"" +ifeq ($(findstring MINGW,$(UNAME)),MINGW) +CMD_MKDIR=if [ ! -d "$(1)" ]; then mkdir -p "$(1)"; fi +CMD_RMDIR=if [ -d "$(1)" ]; then rm -r "$(1)"; fi +else +CMD_MKDIR=cmd /C "if not exist "$(subst /,\,$(1))" mkdir "$(subst /,\,$(1))"" +CMD_RMDIR=cmd /C "if exist "$(subst /,\,$(1))" rmdir /S /Q "$(subst /,\,$(1))"" +endif OS=windows endif -- cgit v1.2.3-70-g09d2