Use mingw32-make for Windows (#4436)
This commit is contained in:
parent
4e3fc84050
commit
91a4f04794
2 changed files with 29 additions and 21 deletions
|
@ -197,11 +197,15 @@ ifeq ($(TARGET_PLATFORM),PLATFORM_ANDROID)
|
||||||
MAKE = mingw32-make
|
MAKE = mingw32-make
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB)
|
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB)
|
||||||
EMMAKE != type emmake
|
ifeq ($(OS),Windows_NT)
|
||||||
ifneq (, $(EMMAKE))
|
|
||||||
MAKE = emmake make
|
|
||||||
else
|
|
||||||
MAKE = mingw32-make
|
MAKE = mingw32-make
|
||||||
|
else
|
||||||
|
EMMAKE != type emmake
|
||||||
|
ifneq (, $(EMMAKE))
|
||||||
|
MAKE = emmake make
|
||||||
|
else
|
||||||
|
MAKE = mingw32-make
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -154,11 +154,15 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
|
||||||
MAKE = mingw32-make
|
MAKE = mingw32-make
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB)
|
ifeq ($(TARGET_PLATFORM),PLATFORM_WEB)
|
||||||
EMMAKE != type emmake
|
ifeq ($(OS),Windows_NT)
|
||||||
ifneq (, $(EMMAKE))
|
|
||||||
MAKE = emmake make
|
|
||||||
else
|
|
||||||
MAKE = mingw32-make
|
MAKE = mingw32-make
|
||||||
|
else
|
||||||
|
EMMAKE != type emmake
|
||||||
|
ifneq (, $(EMMAKE))
|
||||||
|
MAKE = emmake make
|
||||||
|
else
|
||||||
|
MAKE = mingw32-make
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue