소스 검색

fix(build): do not use != assignment in Makefiles (#5464)

GNU Make 3.81 that ships with MacOSX does not understand '!= ...' assignment
so we use ':= $(shell ...)' instead which have the same behavior here.

Additionally, I have changed the use of 'type' to 'command -v'
because assigning the result of 'type' to variable named 'EMMAKE'
does not make much sense. I also reused this variable.

For more detailed information read the linked issue.

Fixes: https://github.com/raysan5/raylib/issues/5460
pull/5466/head
sleeptightAnsiC 1 개월 전
committed by GitHub
부모
커밋
942f93db55
No known key found for this signature in database GPG 키 ID: B5690EEEBB952194
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. +2
    -2
      examples/Makefile
  2. +2
    -2
      examples/Makefile.Web

+ 2
- 2
examples/Makefile 파일 보기

@ -213,9 +213,9 @@ ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_WEB PLATFORM_WEB_R
ifeq ($(PLATFORM_OS),WINDOWS)
MAKE = mingw32-make
else
EMMAKE != type emmake
EMMAKE := $(shell command -v emmake)
ifneq (, $(EMMAKE))
MAKE = emmake make
MAKE = $(EMMAKE) make
else
MAKE = mingw32-make
endif

+ 2
- 2
examples/Makefile.Web 파일 보기

@ -211,9 +211,9 @@ ifeq ($(TARGET_PLATFORM),$(filter $(TARGET_PLATFORM),PLATFORM_WEB PLATFORM_WEB_R
ifeq ($(PLATFORM_OS),WINDOWS)
MAKE = mingw32-make
else
EMMAKE != type emmake
EMMAKE := $(shell command -v emmake)
ifneq (, $(EMMAKE))
MAKE = emmake make
MAKE = $(EMMAKE) make
else
MAKE = mingw32-make
endif

불러오는 중...
취소
저장