diff options
| author | raysan5 <[email protected]> | 2021-09-21 15:06:06 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2021-09-21 15:06:06 +0200 |
| commit | 1627f3403257d81615bbc20a48d8aecd31b49ef1 (patch) | |
| tree | 0aee08e6f8f4cb933949b433bf19e5d88882bc6d /src/Makefile | |
| parent | 59cabc7d116f1854dcc1b5ff875488848118e0ed (diff) | |
| download | raylib-1627f3403257d81615bbc20a48d8aecd31b49ef1.tar.gz raylib-1627f3403257d81615bbc20a48d8aecd31b49ef1.zip | |
Reviewed some compilation issues #1997
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
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 |