Update Makefile
This commit is contained in:
parent
687187b5cf
commit
ac0362d30e
1 changed files with 15 additions and 6 deletions
21
src/Makefile
21
src/Makefile
|
@ -177,19 +177,15 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID)
|
||||||
|
|
||||||
ifeq ($(ANDROID_ARCH),ARM)
|
ifeq ($(ANDROID_ARCH),ARM)
|
||||||
ANDROID_ARCH_NAME = armeabi-v7a
|
ANDROID_ARCH_NAME = armeabi-v7a
|
||||||
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/arm-linux-androideabi
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(ANDROID_ARCH),ARM64)
|
ifeq ($(ANDROID_ARCH),ARM64)
|
||||||
ANDROID_ARCH_NAME = arm64-v8a
|
ANDROID_ARCH_NAME = arm64-v8a
|
||||||
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/aarch64-linux-android
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(ANDROID_ARCH),x86)
|
ifeq ($(ANDROID_ARCH),x86)
|
||||||
ANDROID_ARCH_NAME = i686
|
ANDROID_ARCH_NAME = i686
|
||||||
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/i686-linux-android
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(ANDROID_ARCH),x86_64)
|
ifeq ($(ANDROID_ARCH),x86_64)
|
||||||
ANDROID_ARCH_NAME = x86_64
|
ANDROID_ARCH_NAME = x86_64
|
||||||
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/x86_64-linux-android
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -403,10 +399,23 @@ ifeq ($(PLATFORM),PLATFORM_RPI)
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),PLATFORM_ANDROID)
|
ifeq ($(PLATFORM),PLATFORM_ANDROID)
|
||||||
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_SYSROOT)/usr/include
|
|
||||||
# Include android_native_app_glue.h
|
# Include android_native_app_glue.h
|
||||||
INCLUDE_PATHS += -I$(NATIVE_APP_GLUE)
|
INCLUDE_PATHS += -I$(NATIVE_APP_GLUE)
|
||||||
|
|
||||||
|
# Android required libraries
|
||||||
|
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include
|
||||||
|
ifeq ($(ANDROID_ARCH),ARM)
|
||||||
|
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/arm-linux-androideabi
|
||||||
|
endif
|
||||||
|
ifeq ($(ANDROID_ARCH),ARM64)
|
||||||
|
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/aarch64-linux-android
|
||||||
|
endif
|
||||||
|
ifeq ($(ANDROID_ARCH),x86)
|
||||||
|
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/i686-linux-android
|
||||||
|
endif
|
||||||
|
ifeq ($(ANDROID_ARCH),x86_64)
|
||||||
|
INCLUDE_PATHS += -I$(ANDROID_SYSROOT)/usr/include/x86_64-linux-android
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Define linker options
|
# Define linker options
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue