diff options
| author | Ray San <raysan5@gmail.com> | 2017-10-04 12:51:53 +0200 |
|---|---|---|
| committer | Ray San <raysan5@gmail.com> | 2017-10-04 12:51:53 +0200 |
| commit | 9000fc28a3286f0af189a4e25f5e6e13568cab4d (patch) | |
| tree | fbe18adce9082d0e14111d60fd7c0f69ef49d4c6 | |
| parent | 412c52499a4288b0b1f1b0626229ebc5ce2b5c27 (diff) | |
| download | raylib-9000fc28a3286f0af189a4e25f5e6e13568cab4d.tar.gz raylib-9000fc28a3286f0af189a4e25f5e6e13568cab4d.zip | |
Keep working on Android shared libs...
| -rw-r--r-- | release/android/armeabi-v7a/libraylib.a | bin | 779070 -> 0 bytes | |||
| -rw-r--r-- | release/android/armeabi-v7a/libraylib.so | bin | 495200 -> 477744 bytes | |||
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/external/openal_soft/lib/android/libopenal.so | bin | 2183284 -> 861680 bytes | |||
| -rw-r--r-- | templates/android_project/Makefile | 4 | ||||
| -rw-r--r-- | templates/android_project/src/_libs/libopenal.a (renamed from templates/android_project/src/libs/libopenal.a) | bin | 1207292 -> 1207292 bytes | |||
| -rw-r--r-- | templates/android_project/src/_libs/libraylib.a (renamed from templates/android_project/src/libs/libraylib.a) | bin | 759594 -> 759594 bytes | |||
| -rw-r--r-- | templates/android_project/src/libs/libopenal.so (renamed from templates/android_project/src/libs_shared/libopenal.so) | bin | 861680 -> 861680 bytes |
8 files changed, 3 insertions, 3 deletions
diff --git a/release/android/armeabi-v7a/libraylib.a b/release/android/armeabi-v7a/libraylib.a Binary files differdeleted file mode 100644 index 7d698642..00000000 --- a/release/android/armeabi-v7a/libraylib.a +++ /dev/null diff --git a/release/android/armeabi-v7a/libraylib.so b/release/android/armeabi-v7a/libraylib.so Binary files differindex 9641815e..a9cbca41 100644 --- a/release/android/armeabi-v7a/libraylib.so +++ b/release/android/armeabi-v7a/libraylib.so 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 Binary files differindex e384d9ad..d0f913a6 100644 --- a/src/external/openal_soft/lib/android/libopenal.so +++ b/src/external/openal_soft/lib/android/libopenal.so 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 Binary files differindex ffc90321..ffc90321 100644 --- a/templates/android_project/src/libs/libopenal.a +++ b/templates/android_project/src/_libs/libopenal.a diff --git a/templates/android_project/src/libs/libraylib.a b/templates/android_project/src/_libs/libraylib.a Binary files differindex 3406efc6..3406efc6 100644 --- a/templates/android_project/src/libs/libraylib.a +++ b/templates/android_project/src/_libs/libraylib.a diff --git a/templates/android_project/src/libs_shared/libopenal.so b/templates/android_project/src/libs/libopenal.so Binary files differindex 4354b3f4..d0f913a6 100644 --- a/templates/android_project/src/libs_shared/libopenal.so +++ b/templates/android_project/src/libs/libopenal.so |