diff options
| author | raysan5 <[email protected]> | 2022-02-12 17:58:38 +0100 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2022-02-12 17:58:38 +0100 |
| commit | ddba8478c53f32e00b89432b960d2c69392e4360 (patch) | |
| tree | 793b355d1f40d2040f34d64a970a47fe7000b662 /src | |
| parent | ab47c6401e3a7da22a2e9e1f4a2a63144d51e13a (diff) | |
| download | raylib-ddba8478c53f32e00b89432b960d2c69392e4360.tar.gz raylib-ddba8478c53f32e00b89432b960d2c69392e4360.zip | |
Revert "Reviewed Makefile clean target to use CMD shell on Windows"
This reverts commit ab47c6401e3a7da22a2e9e1f4a2a63144d51e13a.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile b/src/Makefile index c63326e1..3048f98a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -36,6 +36,7 @@ # NOTE: Highly recommended to read the raylib Wiki to know how to compile raylib for different platforms # https://github.com/raysan5/raylib/wiki + .PHONY: all clean install uninstall # Define required environment variables @@ -105,7 +106,6 @@ ROOT = $(shell whoami) # By default we suppose we are working on Windows HOST_PLATFORM_OS ?= WINDOWS -PLATFORM_OS ?= WINDOWS # Determine PLATFORM_OS in case PLATFORM_DESKTOP selected ifeq ($(PLATFORM),PLATFORM_DESKTOP) @@ -148,12 +148,6 @@ ifeq ($(PLATFORM),PLATFORM_DRM) 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) # Emscripten required variables EMSDK_PATH ?= C:/emsdk @@ -737,6 +731,12 @@ endif # Clean everything clean: 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 cd $(RAYLIB_RELEASE_PATH) del lib$(RAYLIB_LIB_NAME).a /s |