diff options
| author | raysan5 <[email protected]> | 2020-04-07 17:54:08 +0200 |
|---|---|---|
| committer | raysan5 <[email protected]> | 2020-04-07 17:54:08 +0200 |
| commit | ef9e9bfa7de881e1663dbe403f5ea51f5fab781c (patch) | |
| tree | fc38e0622109ad1eefe01ddad2b64c8bfe8a70eb /src/Makefile | |
| parent | f31b87fae8fb88fd9d9c42293c5be3850a597c8e (diff) | |
| download | raylib-ef9e9bfa7de881e1663dbe403f5ea51f5fab781c.tar.gz raylib-ef9e9bfa7de881e1663dbe403f5ea51f5fab781c.zip | |
Review Android piepline
- Removed generate_android_toolchain, since version r21 AndroidNDK it's the toolchain
- Removed external lib native_app_glue, provided by AndroidNDK
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/Makefile b/src/Makefile index ede7c7f7..98489293 100644 --- a/src/Makefile +++ b/src/Makefile @@ -391,8 +391,7 @@ ifeq ($(PLATFORM),PLATFORM_RPI) INCLUDE_PATHS += -I$(RPI_TOOLCHAIN_SYSROOT)/opt/vc/include/interface/vcos/pthreads endif ifeq ($(PLATFORM),PLATFORM_ANDROID) - NATIVE_APP_GLUE = $(RAYLIB_RELEASE_PATH)/external/android/native_app_glue - #NATIVE_APP_GLUE = $(ANDROID_NDK)/sources/android/native_app_glue + NATIVE_APP_GLUE = $(ANDROID_NDK)/sources/android/native_app_glue # Android required libraries INCLUDE_PATHS += -I$(ANDROID_TOOLCHAIN)/sysroot/usr/include # Include android_native_app_glue.h @@ -445,33 +444,12 @@ ifeq ($(RAYLIB_MODULE_PHYSAC),TRUE) endif ifeq ($(PLATFORM),PLATFORM_ANDROID) - OBJS += external/android/native_app_glue/android_native_app_glue.o + OBJS += $(NATIVE_APP_GLUE)/android_native_app_glue.o endif # Default target entry all: raylib -# Generate standalone Android toolchain -# NOTE: If the host system is Windows or Linux, generation is different -generate_android_toolchain: -ifeq ($(PLATFORM_OS),WINDOWS) - # NOTE: python should be available in the path - ifeq ($(ANDROID_ARCH),ARM) - $(ANDROID_NDK)/build/tools/python make_standalone_toolchain.py --arch arm --api $(ANDROID_API_VERSION) --install-dir $(ANDROID_TOOLCHAIN) - endif - ifeq ($(ANDROID_ARCH),ARM64) - $(ANDROID_NDK)/build/tools/python make_standalone_toolchain.py --arch arm64 --api $(ANDROID_API_VERSION) --install-dir $(ANDROID_TOOLCHAIN) - endif -endif -ifeq ($(PLATFORM_OS),LINUX) - ifeq ($(ANDROID_ARCH),ARM) - $(ANDROID_NDK)/build/tools/make-standalone-toolchain.sh --platform=android-$(ANDROID_API_VERSION) --toolchain=arm-linux-androideabi-4.9 --use-llvm --install-dir=$(ANDROID_TOOLCHAIN) - endif - ifeq ($(ANDROID_ARCH),ARM64) - $(ANDROID_NDK)/build/tools/make-standalone-toolchain.sh --platform=android-$(ANDROID_API_VERSION) --toolchain=aarch64-linux-androideabi-4.9 --use-llvm --install-dir=$(ANDROID_TOOLCHAIN) - endif -endif - # Compile raylib library # NOTE: Release directory is created if not exist raylib: $(OBJS) |