Makefile.Win32: fixed detection of Windows Command Prompt for rmdir command

This commit is contained in:
Bart Trzynadlowski 2023-03-28 15:38:43 -07:00
parent 87de86f7d1
commit 6993dfcfb0

View file

@ -70,11 +70,13 @@ ifneq ($(filter $(strip $(BITS)),32 64),$(strip $(BITS)))
endif endif
# #
# Use Bash or Windows Prompt shell commands? # Use Bash or Windows Command Prompt shell commands?
# #
DELETE = rm -d -r -f ifneq (,$(findstring cmd.exe,$(shell echo %COMSPEC%)))
ifeq ($(strip $(MSYSTEM)),1) # 'echo %COMSPEC%' returns path to cmd.exe on Windows, '%COMSPEC%' in bash
DELETE = rmdir /s /q RMDIR = rmdir /s /q
else
RMDIR = rm -d -r -f
endif endif
# #
@ -113,8 +115,8 @@ include Makefiles/Rules.inc
clean: clean:
$(SILENT)echo Cleaning up $(BIN_DIR) and $(OBJ_DIR)... $(SILENT)echo Cleaning up $(BIN_DIR) and $(OBJ_DIR)...
$(SILENT)$(DELETE) $(BIN_DIR) $(SILENT)$(RMDIR) $(BIN_DIR)
$(SILENT)$(DELETE) $(OBJ_DIR) $(SILENT)$(RMDIR) $(OBJ_DIR)
############################################################################### ###############################################################################