File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ HOST_PLATFORM_OS ?= WINDOWS
114
114
PLATFORM_OS ?= WINDOWS
115
115
116
116
# Determine PLATFORM_OS when required
117
- ifeq ($(PLATFORM ) ,$(filter $(PLATFORM ) ,PLATFORM_DESKTOP PLATFORM_DESKTOP_SDL PLATFORM_WEB) )
117
+ ifeq ($(PLATFORM ) ,$(filter $(PLATFORM ) ,PLATFORM_DESKTOP PLATFORM_DESKTOP_SDL PLATFORM_WEB PLATFORM_ANDROID ) )
118
118
# No uname.exe on MinGW!, but OS=Windows_NT on Windows!
119
119
# ifeq ($(UNAME),Msys) -> Windows
120
120
ifeq ($(OS),Windows_NT)
@@ -189,8 +189,12 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
189
189
ANDROID_NDK ?= C:/android-ndk
190
190
ANDROID_TOOLCHAIN = $(ANDROID_NDK ) /toolchains/llvm/prebuilt/windows-x86_64
191
191
else
192
- ANDROID_NDK ?= /usr/lib/android/ndk
193
- ANDROID_TOOLCHAIN = $(ANDROID_NDK ) /toolchains/llvm/prebuilt/linux-x86_64
192
+ ANDROID_NDK ?= /usr/lib/android/ndk
193
+ ifeq ($(PLATFORM_OS), OSX)
194
+ ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/darwin-x86_64
195
+ else
196
+ ANDROID_TOOLCHAIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64
197
+ endif
194
198
endif
195
199
196
200
# NOTE: Sysroot can also be reference from $(ANDROID_NDK)/sysroot
You can’t perform that action at this time.
0 commit comments