From 1627f3403257d81615bbc20a48d8aecd31b49ef1 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Tue, 21 Sep 2021 15:06:06 +0200 Subject: Reviewed some compilation issues #1997 --- src/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 4d98c66e..38027a2a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -254,7 +254,12 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif ifeq ($(PLATFORM),PLATFORM_ANDROID) # Android toolchain (must be provided for desired architecture and compiler) - CC = $(ANDROID_TOOLCHAIN)/bin/$(ANDROID_COMPILER_ARCH)-linux-androideabi$(ANDROID_API_VERSION)-clang + ifeq ($(ANDROID_ARCH),arm) + CC = $(ANDROID_TOOLCHAIN)/bin/$(ANDROID_COMPILER_ARCH)-linux-androideabi$(ANDROID_API_VERSION)-clang + endif + ifeq ($(ANDROID_ARCH),arm64) + CC = $(ANDROID_TOOLCHAIN)/bin/$(ANDROID_COMPILER_ARCH)-linux-android$(ANDROID_API_VERSION)-clang + endif # It seems from Android NDK r22 onwards we need to use llvm-ar AR = $(ANDROID_TOOLCHAIN)/bin/llvm-ar endif -- cgit v1.2.3