diff options
| author | Ray <[email protected]> | 2018-07-07 09:38:19 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-07-07 09:38:19 +0200 |
| commit | 50088bf49bd923e32a93a6687f030f289d5805ac (patch) | |
| tree | d51683a467f7269e1411a4c339df42c205f04d64 /src/Makefile | |
| parent | 7c80a517b49fc8474e74fe96adad626166fa1384 (diff) | |
| parent | fa36c5294affc5f960c14291f4c2336f1a3557e1 (diff) | |
| download | raylib-50088bf49bd923e32a93a6687f030f289d5805ac.tar.gz raylib-50088bf49bd923e32a93a6687f030f289d5805ac.zip | |
Merge pull request #570 from SethArchambault/master
SNES-like GAMEPAD Support added for Android, Makefile has optional support for 32bit
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 6f71874f..8ba6d303 100644 --- a/src/Makefile +++ b/src/Makefile @@ -208,6 +208,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) ifeq ($(ANDROID_ARCH),ARM64) RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/android/arm64-v8a endif + ifeq ($(ANDROID_ARCH),ARM) + RAYLIB_RELEASE_PATH = $(RAYLIB_PATH)/release/libs/android/armeabi-v7a + endif endif # Define raylib graphics api depending on selected platform @@ -261,6 +264,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) ifeq ($(ANDROID_ARCH),ARM64) CC = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-clang endif + ifeq ($(ANDROID_ARCH),ARM) + CC = $(ANDROID_TOOLCHAIN)/bin/arm-linux-androideabi-clang + endif endif # Default archiver program to pack libraries @@ -279,6 +285,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) ifeq ($(ANDROID_ARCH),ARM64) AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar endif + ifeq ($(ANDROID_ARCH),ARM) + AR = $(ANDROID_TOOLCHAIN)/bin/arm-linux-androideabi-ar + endif endif # Define compiler flags: @@ -317,8 +326,12 @@ ifeq ($(PLATFORM),PLATFORM_WEB) endif ifeq ($(PLATFORM),PLATFORM_ANDROID) # Compiler flags for arquitecture (only ARM, not ARM64) - #CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 - CFLAGS += -target aarch64 -mfix-cortex-a53-835769 + ifeq ($(ANDROID_ARCH),ARM64) + CFLAGS += -target aarch64 -mfix-cortex-a53-835769 + endif + ifeq ($(ANDROID_ARCH),ARM) + CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 + endif # Compilation functions attributes options CFLAGS += -ffunction-sections -funwind-tables -fstack-protector-strong -fPIE -fPIC # Compiler options for the linker @@ -439,6 +452,9 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) ifeq ($(ANDROID_ARCH),ARM64) $(ANDROID_NDK)/build/tools/make-standalone-toolchain.sh --platform=android-21 --toolchain=aarch64-linux-androideabi-4.9 --use-llvm --install-dir=$(ANDROID_TOOLCHAIN) endif + ifeq ($(ANDROID_ARCH),ARM) + $(ANDROID_NDK)/build/tools/make-standalone-toolchain.sh --platform=android-21 --toolchain=arm-linux-androideabi-4.9 --use-llvm --install-dir=$(ANDROID_TOOLCHAIN) + endif endif # Compile raylib library |