From 9000fc28a3286f0af189a4e25f5e6e13568cab4d Mon Sep 17 00:00:00 2001 From: Ray San Date: Wed, 4 Oct 2017 12:51:53 +0200 Subject: Keep working on Android shared libs... --- release/android/armeabi-v7a/libraylib.a | Bin 779070 -> 0 bytes release/android/armeabi-v7a/libraylib.so | Bin 495200 -> 477744 bytes src/Makefile | 2 +- src/external/openal_soft/lib/android/libopenal.so | Bin 2183284 -> 861680 bytes templates/android_project/Makefile | 4 ++-- templates/android_project/src/_libs/libopenal.a | Bin 0 -> 1207292 bytes templates/android_project/src/_libs/libraylib.a | Bin 0 -> 759594 bytes templates/android_project/src/libs/libopenal.a | Bin 1207292 -> 0 bytes templates/android_project/src/libs/libopenal.so | Bin 0 -> 861680 bytes templates/android_project/src/libs/libraylib.a | Bin 759594 -> 0 bytes .../android_project/src/libs_shared/libopenal.so | Bin 861680 -> 0 bytes 11 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 release/android/armeabi-v7a/libraylib.a create mode 100644 templates/android_project/src/_libs/libopenal.a create mode 100644 templates/android_project/src/_libs/libraylib.a delete mode 100644 templates/android_project/src/libs/libopenal.a create mode 100644 templates/android_project/src/libs/libopenal.so delete mode 100644 templates/android_project/src/libs/libraylib.a delete mode 100644 templates/android_project/src/libs_shared/libopenal.so diff --git a/release/android/armeabi-v7a/libraylib.a b/release/android/armeabi-v7a/libraylib.a deleted file mode 100644 index 7d698642..00000000 Binary files a/release/android/armeabi-v7a/libraylib.a and /dev/null differ diff --git a/release/android/armeabi-v7a/libraylib.so b/release/android/armeabi-v7a/libraylib.so index 9641815e..a9cbca41 100644 Binary files a/release/android/armeabi-v7a/libraylib.so and b/release/android/armeabi-v7a/libraylib.so differ diff --git a/src/Makefile b/src/Makefile index 117cbe5a..405f9194 100644 --- a/src/Makefile +++ b/src/Makefile @@ -261,7 +261,7 @@ ifeq ($(PLATFORM),PLATFORM_ANDROID) # Force linking of library module to define symbol LDFLAGS += -u ANativeActivity_onCreate # Library paths containing required libs - LDFLAGS += -L. -Lsrc -L$(OUTPUT_PATH) + LDFLAGS += -L. -Lsrc -L$(OUTPUT_PATH) -Lexternal/openal_soft/lib/android LDLIBS = -lopenal -llog -landroid -lEGL -lGLESv2 -lOpenSLES -latomic -lc -lm endif diff --git a/src/external/openal_soft/lib/android/libopenal.so b/src/external/openal_soft/lib/android/libopenal.so index e384d9ad..d0f913a6 100644 Binary files a/src/external/openal_soft/lib/android/libopenal.so and b/src/external/openal_soft/lib/android/libopenal.so differ diff --git a/templates/android_project/Makefile b/templates/android_project/Makefile index 72bf635c..930069ec 100644 --- a/templates/android_project/Makefile +++ b/templates/android_project/Makefile @@ -33,8 +33,8 @@ PROJECT_DIR = ./ LIBRARY_NAME = raylib_game # define libtype for raylib and OpenAL Soft: STATIC (.a) or SHARED (.so/.dll) -RAYLIB_LIBTYPE ?= STATIC -OPENAL_LIBTYPE ?= STATIC +RAYLIB_LIBTYPE ?= SHARED +OPENAL_LIBTYPE ?= SHARED # add shared libs to APK if required ifeq ($(RAYLIB_LIBTYPE),SHARED) diff --git a/templates/android_project/src/_libs/libopenal.a b/templates/android_project/src/_libs/libopenal.a new file mode 100644 index 00000000..ffc90321 Binary files /dev/null and b/templates/android_project/src/_libs/libopenal.a differ diff --git a/templates/android_project/src/_libs/libraylib.a b/templates/android_project/src/_libs/libraylib.a new file mode 100644 index 00000000..3406efc6 Binary files /dev/null and b/templates/android_project/src/_libs/libraylib.a differ diff --git a/templates/android_project/src/libs/libopenal.a b/templates/android_project/src/libs/libopenal.a deleted file mode 100644 index ffc90321..00000000 Binary files a/templates/android_project/src/libs/libopenal.a and /dev/null differ diff --git a/templates/android_project/src/libs/libopenal.so b/templates/android_project/src/libs/libopenal.so new file mode 100644 index 00000000..d0f913a6 Binary files /dev/null and b/templates/android_project/src/libs/libopenal.so differ diff --git a/templates/android_project/src/libs/libraylib.a b/templates/android_project/src/libs/libraylib.a deleted file mode 100644 index 3406efc6..00000000 Binary files a/templates/android_project/src/libs/libraylib.a and /dev/null differ diff --git a/templates/android_project/src/libs_shared/libopenal.so b/templates/android_project/src/libs_shared/libopenal.so deleted file mode 100644 index 4354b3f4..00000000 Binary files a/templates/android_project/src/libs_shared/libopenal.so and /dev/null differ -- cgit v1.2.3