UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Reviewed Makefile clean target to use CMD shell on Windows"

Browse source 
This reverts commit ab47c6401e.
This commit is contained in:
raysan5 2022-02-12 17:58:38 +01:00
parent ab47c6401e
commit ddba8478c5
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Makefile
View file

@ -36,6 +36,7 @@
# NOTE: Highly recommended to read the raylib Wiki to know how to compile raylib for different platforms # NOTE: Highly recommended to read the raylib Wiki to know how to compile raylib for different platforms
# https://github.com/raysan5/raylib/wiki # https://github.com/raysan5/raylib/wiki
.PHONY: all clean install uninstall .PHONY: all clean install uninstall
# Define required environment variables # Define required environment variables
@ -105,7 +106,6 @@ ROOT = $(shell whoami)
# By default we suppose we are working on Windows # By default we suppose we are working on Windows
HOST_PLATFORM_OS ?= WINDOWS HOST_PLATFORM_OS ?= WINDOWS
PLATFORM_OS ?= WINDOWS
# Determine PLATFORM_OS in case PLATFORM_DESKTOP selected # Determine PLATFORM_OS in case PLATFORM_DESKTOP selected
ifeq ($(PLATFORM),PLATFORM_DESKTOP) ifeq ($(PLATFORM),PLATFORM_DESKTOP)
@ -148,12 +148,6 @@ ifeq ($(PLATFORM),PLATFORM_DRM)
endif endif
endif endif
ifeq ($(PLATFORM_OS),WINDOWS)
# Make uses by default Sh shell, if a different shell is required, it must be specified
# On Windows we set CMD as default shell to allow calling del command on clean target
SHELL := cmd
endif
ifeq ($(PLATFORM),PLATFORM_WEB) ifeq ($(PLATFORM),PLATFORM_WEB)
# Emscripten required variables # Emscripten required variables
EMSDK_PATH ?= C:/emsdk EMSDK_PATH ?= C:/emsdk
@ -737,6 +731,12 @@ endif
# Clean everything # Clean everything
clean: clean:
ifeq ($(PLATFORM_OS),WINDOWS) ifeq ($(PLATFORM_OS),WINDOWS)
# Make always tries to run build rules under sh.exe by default
# So if sh.exe is present in the PATH on windows, the del commands will fail
# see README.W32 of GNU Make for more details
# It is not specified earlier in the Makefile, because then cross-compilation
# will also fail.
SHELL = cmd
del *.o /s del *.o /s
cd $(RAYLIB_RELEASE_PATH) cd $(RAYLIB_RELEASE_PATH)
del lib$(RAYLIB_LIB_NAME).a /s del lib$(RAYLIB_LIB_NAME).a /s