From ad78ab92be58d911fd674a48e04ef64a1b255a43 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 24 Nov 2023 12:31:33 +0100 Subject: [PATCH] Corrected the path of android ndk toolchains for OSX platforms --- src/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 2ee0c5a06aa5..3ccea903b6d5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -114,7 +114,7 @@ HOST_PLATFORM_OS ?= WINDOWS PLATFORM_OS ?= WINDOWS # Determine PLATFORM_OS when required -ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_DESKTOP_SDL PLATFORM_WEB)) +ifeq ($(PLATFORM),$(filter $(PLATFORM),PLATFORM_DESKTOP PLATFORM_DESKTOP_SDL PLATFORM_WEB PLATFORM_ANDROID)) # No uname.exe on MinGW!, but OS=Windows_NT on Windows! # ifeq ($(UNAME),Msys) -> Windows ifeq ($(OS),Windows_NT) @@ -189,8 +189,12 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) ANDROID_NDK ?= C:/android-ndk ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/windows-x86_64 else - ANDROID_NDK ?= /usr/lib/android/ndk - ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64 + ANDROID_NDK ?= /usr/lib/android/ndk + ifeq ($(PLATFORM_OS), OSX) + ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/darwin-x86_64 + else + ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64 + endif endif # NOTE: Sysroot can also be reference from $(ANDROID_NDK)/sysroot