diff options
| author | raysan5 <[email protected]> | 2020-07-14 19:09:58 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-07-14 19:09:58 +0200 |
| commit | dd5f448f25fd5613ef6eed46b1dcc8f84055387c (patch) | |
| tree | f5970c0918f64846c4be02df472330b851851114 /templates/advance_game/Makefile.Android | |
| parent | 0b52c57a24889e626c69b20fe36d8968043222d1 (diff) | |
| download | raylib-dd5f448f25fd5613ef6eed46b1dcc8f84055387c.tar.gz raylib-dd5f448f25fd5613ef6eed46b1dcc8f84055387c.zip | |
Update Makefile Android
Diffstat (limited to 'templates/advance_game/Makefile.Android')
| -rw-r--r-- | templates/advance_game/Makefile.Android | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/templates/advance_game/Makefile.Android b/templates/advance_game/Makefile.Android index 83f245d2..381646ca 100644 --- a/templates/advance_game/Makefile.Android +++ b/templates/advance_game/Makefile.Android @@ -26,22 +26,39 @@ PLATFORM ?= PLATFORM_ANDROID RAYLIB_PATH ?= ..\.. # Define Android architecture (armeabi-v7a, arm64-v8a, x86, x86-64) and API version -# Starting in 2019 using ARM64 is mandatory for published apps, +# Starting at 2019 using ARM64 is mandatory for published apps, # and minimum required target API is Android 9 (API level 28) -ANDROID_ARCH ?= ARM -ANDROID_API_VERSION = 21 +ANDROID_ARCH ?= ARM +ANDROID_API_VERSION ?= 28 + +# Android required path variables +# NOTE: Starting with Android NDK r21, no more toolchain generation is required, NDK is the toolchain on itself +ifeq ($(OS),Windows_NT) + 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 +endif + ifeq ($(ANDROID_ARCH),ARM) - ANDROID_ARCH_NAME = armeabi-v7a + ANDROID_ARCH_NAME = armeabi-v7a endif ifeq ($(ANDROID_ARCH),ARM64) - ANDROID_ARCH_NAME = arm64-v8a + ANDROID_ARCH_NAME = arm64-v8a +endif +ifeq ($(ANDROID_ARCH),x86) + ANDROID_ARCH_NAME = i686 +endif +ifeq ($(ANDROID_ARCH),x86_64) + ANDROID_ARCH_NAME = x86_64 endif # Required path variables # NOTE: JAVA_HOME must be set to JDK (using OpenJDK 13) JAVA_HOME ?= C:/open-jdk ANDROID_HOME = C:/android-sdk -ANDROID_TOOLCHAIN = C:/android-ndk-r21/toolchains/llvm/prebuilt/windows-x86_64 +ANDROID_TOOLCHAIN = C:/android-ndk/toolchains/llvm/prebuilt/windows-x86_64 ANDROID_BUILD_TOOLS = $(ANDROID_HOME)/build-tools/29.0.3 ANDROID_PLATFORM_TOOLS = $(ANDROID_HOME)/platform-tools @@ -288,7 +305,7 @@ logcat: # Install and monitorize $(PROJECT_NAME).apk to default emulator/device deploy: - $(ANDROID_PLATFORM_TOOLS)/adb install -r $(PROJECT_NAME).apk + $(ANDROID_PLATFORM_TOOLS)/adb install $(PROJECT_NAME).apk $(ANDROID_PLATFORM_TOOLS)/adb logcat -c $(ANDROID_PLATFORM_TOOLS)/adb logcat raylib:V *:S |