diff --git a/scripts/tools.mk b/scripts/tools.mk index fd2da3dd0..7acee1b80 100644 --- a/scripts/tools.mk +++ b/scripts/tools.mk @@ -8,20 +8,24 @@ SILENT?=@ THISDIR:=$(dir $(lastword $(MAKEFILE_LIST))) UNAME:=$(shell uname) -ifeq ($(UNAME),$(filter Linux Darwin MINGW%,$(UNAME))) -CMD_MKDIR=mkdir -p "$(1)" -CMD_RMDIR=rm -r "$(1)" +ifeq ($(UNAME),$(filter Linux Darwin,$(UNAME))) ifeq ($(UNAME),$(filter Darwin,$(UNAME))) OS=darwin -else ifeq ($(UNAME),$(filter MINGW%,$(UNAME))) -OS=windows else OS=linux endif +else ifeq ($(UNAME),$(filter MINGW%,$(UNAME))) +OS=windows +else +OS=windows +endif + +ifneq ($(findstring sh,$(notdir $(SHELL))),) +CMD_MKDIR=mkdir -p "$(1)" +CMD_RMDIR=rm -rf "$(1)" 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))"" -OS=windows endif SHADERC:="$(THISDIR)../tools/bin/$(OS)/shaderc"