summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--release/libs/android/arm64-v8a/libraylib.abin1174322 -> 1049956 bytes
-rw-r--r--release/libs/android/arm64-v8a/libraylib.sobin553384 -> 573488 bytes
-rw-r--r--src/Makefile8
-rw-r--r--templates/standard_game/Makefile.Android5
4 files changed, 8 insertions, 5 deletions
diff --git a/release/libs/android/arm64-v8a/libraylib.a b/release/libs/android/arm64-v8a/libraylib.a
index ea88692c..3c593bbc 100644
--- a/release/libs/android/arm64-v8a/libraylib.a
+++ b/release/libs/android/arm64-v8a/libraylib.a
Binary files differ
diff --git a/release/libs/android/arm64-v8a/libraylib.so b/release/libs/android/arm64-v8a/libraylib.so
index 04e53f03..5f46683b 100644
--- a/release/libs/android/arm64-v8a/libraylib.so
+++ b/release/libs/android/arm64-v8a/libraylib.so
Binary files differ
diff --git a/src/Makefile b/src/Makefile
index c83a62ef..c05e74bb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -309,14 +309,14 @@ 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 -mgeneral-regs-only
+ CFLAGS += -target aarch64 -mfix-cortex-a53-835769
# Compilation functions attributes options
CFLAGS += -ffunction-sections -funwind-tables -fstack-protector-strong -fPIE -fPIC
# Compiler options for the linker
# -Werror=format-security
CFLAGS += -Wa,--noexecstack -Wformat -no-canonical-prefixes
# Preprocessor macro definitions
- CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=21
+ CFLAGS += -DANDROID -DPLATFORM_ANDROID -D__ANDROID_API__=21 -DMAL_NO_OSS
endif
# Define required compilation flags for raylib SHARED lib
@@ -416,6 +416,10 @@ ifeq ($(INCLUDE_AUDIO_MODULE),TRUE)
endif
endif
+ifeq ($(PLATFORM),PLATFORM_ANDROID)
+ OBJS += external/android/native_app_glue/android_native_app_glue.o
+endif
+
# Default target entry
all: raylib
diff --git a/templates/standard_game/Makefile.Android b/templates/standard_game/Makefile.Android
index 76a54536..87b04722 100644
--- a/templates/standard_game/Makefile.Android
+++ b/templates/standard_game/Makefile.Android
@@ -77,7 +77,7 @@ AR = $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android-ar
# Compiler flags for arquitecture
#CFLAGS = -std=c99 -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 --> Old 32bit
-CFLAGS = -std=c99 -target aarch64
+CFLAGS = -std=c99 -target aarch64 -mfix-cortex-a53-835769
# Compilation functions attributes options
CFLAGS += -ffunction-sections -funwind-tables -fstack-protector-strong -fPIC
# Compiler options for the linker
@@ -98,7 +98,7 @@ LDFLAGS += -L. -L$(PROJECT_BUILD_PATH)/obj -L$(PROJECT_BUILD_PATH)/lib/arm64-v8a
# Define any libraries to link into executable
# if you want to link libraries (libname.so or libname.a), use the -lname
-LDLIBS = -static -lraylib -lnative_app_glue -llog -landroid -lEGL -lGLESv2 -lOpenSLES -lm -ldl -lc
+LDLIBS = -lm -lc -lraylib -llog -landroid -lEGL -lGLESv2 -lOpenSLES -ldl
# Generate target objects list from PROJECT_SOURCE_FILES
OBJS = $(patsubst %.c, $(PROJECT_BUILD_PATH)/obj/%.o, $(PROJECT_SOURCE_FILES))
@@ -112,7 +112,6 @@ all: create_temp_project_dirs \
generate_android_manifest \
generate_apk_keystore \
config_project_package \
- compile_native_app_glue \
compile_project_code \
compile_project_class \
compile_project_class_dex \