diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-04-22 01:32:56 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-04-22 01:32:56 +0300 |
| commit | 019a6872153bc5b976f3fb77ee82868ec6c9766c (patch) | |
| tree | d3c936798ae0f2d07cd787e1758f7968ab0dd866 /android | |
| parent | 3bfdba4d2339d0250226d6bac028ce51e28ec59c (diff) | |
| parent | ad9e507ad8e37898ffcfa8492dbf90def964389d (diff) | |
| download | libADLMIDI-019a6872153bc5b976f3fb77ee82868ec6c9766c.tar.gz libADLMIDI-019a6872153bc5b976f3fb77ee82868ec6c9766c.tar.bz2 libADLMIDI-019a6872153bc5b976f3fb77ee82868ec6c9766c.zip | |
Merge branch 'master' into stable
# Conflicts:
# android/jni/Android.mk
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 7 | ||||
| -rw-r--r-- | android/jni/Android.mk | 30 | ||||
| -rw-r--r-- | android/jni/Application.mk | 2 |
3 files changed, 36 insertions, 3 deletions
diff --git a/android/Android.mk b/android/Android.mk index b87ff40..2fe6760 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -3,7 +3,12 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := adlmidi_shared LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libADLMIDI.so -LOCAL_CFLAGS := -DENABLE_BEGIN_SILENCE_SKIPPING +LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../src $(LOCAL_PATH)/../include +TARGET_PLATFORM = android-14 + +include $(CLEAR_VARS) +LOCAL_MODULE := adlmidi_RT_shared +LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libADLMIDIrt.so LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../src $(LOCAL_PATH)/../include TARGET_PLATFORM = android-14 diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 26bd8eb..66515fd 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir)/../.. -include $(CLEAR_VARS) +include $(CLEAR_VARS) LOCAL_MODULE := ADLMIDI LOCAL_C_INCLUDES := \ @@ -18,6 +18,34 @@ LOCAL_SRC_FILES := src/adldata.cpp \ src/adlmidi_private.cpp \ src/adlmidi_xmi2mid.c \ src/adlmidi.cpp \ + src/wopl/wopl_file.c \ + src/chips/dosbox_opl3.cpp \ + src/chips/nuked_opl3_v174.cpp \ + src/chips/nuked_opl3.cpp \ + src/chips/opl_chip_base.cpp \ + src/chips/dosbox/dbopl.cpp \ + src/chips/nuked/nukedopl3_174.c \ + src/chips/nuked/nukedopl3.c + +include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := ADLMIDIrt + +LOCAL_C_INCLUDES := \ + $(LOCAL_PATH)/src \ + $(LOCAL_PATH)/include + +LOCAL_ARM_MODE := arm +LOCAL_CPP_FEATURES := exceptions +LOCAL_CFLAGS := -DADLMIDI_DISABLE_MIDI_SEQUENCER -DADLMIDI_DISABLE_MUS_SUPPORT -DADLMIDI_DISABLE_XMI_SUPPORT -DDISABLE_EMBEDDED_BANKS +LOCAL_LDLIBS := -llog +LOCAL_SRC_FILES := src/adlmidi_load.cpp \ + src/adlmidi_midiplay.cpp \ + src/adlmidi_opl3.cpp \ + src/adlmidi_private.cpp \ + src/adlmidi.cpp \ + src/wopl/wopl_file.c \ src/chips/dosbox_opl3.cpp \ src/chips/nuked_opl3_v174.cpp \ src/chips/nuked_opl3.cpp \ diff --git a/android/jni/Application.mk b/android/jni/Application.mk index a0d5ce7..354e4d1 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,5 +1,5 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 -APP_MODULES := ADLMIDI +APP_MODULES := ADLMIDI ADLMIDIrt APP_PLATFORM := android-14 APP_OPTIM := release APP_CPPFLAGS += -std=c++11 |