Skip to content

fix android build #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 49 additions & 11 deletions build_android/jni/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,56 @@ LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include $(LOCAL_PATH)/../../OpenAL32/Include $(LOCAL_PATH)/../../mob/Include
#LOCAL_LDLIBS += -lOpenSLES

LOCAL_SHARED_LIBRARIES += libOpenSLES

LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../OpenAL32/Include
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../mob/Include

LOCAL_MODULE := OpenAL-MOB
LOCAL_SRC_FILES := ../../Alc/ALc.c ../../Alc/alcConfig.c ../../Alc/alcDedicated.c ../../Alc/alcEcho.c ../../Alc/alcModulator.c ../../Alc/alcReverb.c ../../Alc/alcRing.c ../../Alc/alcThread.c ../../Alc/ALu.c ../../Alc/backends/loopback.c ../../Alc/backends/null.c ../../Alc/backends/opensl.c ../../Alc/backends/wave.c ../../Alc/bs2b.c ../../Alc/helpers.c ../../Alc/hrtf.c ../../Alc/mixer.c ../../Alc/mixer_c.c ../../Alc/mixer_neon.c ../../Alc/mixer_sse.c ../../Alc/panning.c ../../mob/alConfigMob.c ../../OpenAL32/alAuxEffectSlot.c ../../OpenAL32/alBuffer.c ../../OpenAL32/alEffect.c ../../OpenAL32/alError.c ../../OpenAL32/alExtension.c ../../OpenAL32/alFilter.c ../../OpenAL32/alListener.c ../../OpenAL32/alSource.c ../../OpenAL32/alState.c ../../OpenAL32/alThunk.c

# set the platform flags
ifeq ($(APP_ABI),x86)
LOCAL_CFLAGS += -D HAVE_SSE
else
LOCAL_CFLAGS += -D HAVE_NEON -mfloat-abi=softfp -mfpu=neon -marm
endif
LOCAL_SRC_FILES := ../../Alc/ALc.c
LOCAL_SRC_FILES += ../../Alc/alcConfig.c
LOCAL_SRC_FILES += ../../Alc/alcDedicated.c
LOCAL_SRC_FILES += ../../Alc/alcEcho.c
LOCAL_SRC_FILES += ../../Alc/alcModulator.c
LOCAL_SRC_FILES += ../../Alc/alcReverb.c
LOCAL_SRC_FILES += ../../Alc/alcRing.c
LOCAL_SRC_FILES += ../../Alc/alcThread.c
LOCAL_SRC_FILES += ../../Alc/ALu.c
LOCAL_SRC_FILES += ../../Alc/backends/loopback.c
LOCAL_SRC_FILES += ../../Alc/backends/null.c
LOCAL_SRC_FILES += ../../Alc/backends/opensl.c
LOCAL_SRC_FILES += ../../Alc/backends/wave.c
LOCAL_SRC_FILES += ../../Alc/bs2b.c
LOCAL_SRC_FILES += ../../Alc/helpers.c
LOCAL_SRC_FILES += ../../Alc/hrtf.c
LOCAL_SRC_FILES += ../../Alc/mixer.c
LOCAL_SRC_FILES += ../../Alc/mixer_c.c
LOCAL_SRC_FILES += ../../Alc/mixer_neon.c
LOCAL_SRC_FILES += ../../Alc/mixer_sse.c
LOCAL_SRC_FILES += ../../Alc/panning.c
LOCAL_SRC_FILES += ../../mob/alConfigMob.c
LOCAL_SRC_FILES += ../../OpenAL32/alAuxEffectSlot.c
LOCAL_SRC_FILES += ../../OpenAL32/alBuffer.c
LOCAL_SRC_FILES += ../../OpenAL32/alEffect.c
LOCAL_SRC_FILES += ../../OpenAL32/alError.c
LOCAL_SRC_FILES += ../../OpenAL32/alExtension.c
LOCAL_SRC_FILES += ../../OpenAL32/alFilter.c
LOCAL_SRC_FILES += ../../OpenAL32/alListener.c
LOCAL_SRC_FILES += ../../OpenAL32/alSource.c
LOCAL_SRC_FILES += ../../OpenAL32/alState.c
LOCAL_SRC_FILES += ../../OpenAL32/alThunk.c

LOCAL_CFLAGS += -D HAVE_NEON -mfloat-abi=softfp -mfpu=neon -marm

LOCAL_CFLAGS += -fno-stack-protector


#LOCAL_SHARED_LIBRARIES += libOpenSLES
LOCAL_LDFLAGS += -lOpenSLES

include $(BUILD_SHARED_LIBRARY)
#include $(BUILD_SHARED_LIBRARY)
include $(BUILD_STATIC_LIBRARY)
6 changes: 2 additions & 4 deletions build_android/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# set this to x86 to test on an x86 emulator
#APP_ABI := x86

# set this for ARM (which is also the default)
#APP_API := armeabi
APP_API := armeabi-v7a


APP_PLATFORM := android-15