From 3a410074608a75e5a8e8d36aa6d3872f17882c94 Mon Sep 17 00:00:00 2001 From: loki666 Date: Tue, 17 Apr 2018 16:56:16 +0200 Subject: fix Android.mk --- android/jni/Android.mk | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'android/jni') diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 834379c..26bd8eb 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -10,9 +10,20 @@ LOCAL_C_INCLUDES := \ LOCAL_ARM_MODE := arm LOCAL_CPP_FEATURES := exceptions LOCAL_LDLIBS := -llog -LOCAL_SRC_FILES := src/adldata.cpp src/adlmidi.cpp src/dbopl.cpp src/nukedopl3.c \ - src/adlmidi_load.cpp src/adlmidi_midiplay.cpp \ - src/adlmidi_opl3.cpp src/adlmidi_private.cpp \ - src/adlmidi_xmi2mid.c src/adlmidi_mus2mid.c +LOCAL_SRC_FILES := src/adldata.cpp \ + src/adlmidi_load.cpp \ + src/adlmidi_midiplay.cpp \ + src/adlmidi_mus2mid.c \ + src/adlmidi_opl3.cpp \ + src/adlmidi_private.cpp \ + src/adlmidi_xmi2mid.c \ + src/adlmidi.cpp \ + 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) -- cgit v1.2.3 From 2c99f0ebc3b2f2cc99b9e7acd8c138921020675d Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Fri, 20 Apr 2018 02:01:56 +0300 Subject: Android.mk: Add wopl_file.c into the script --- android/jni/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'android/jni') diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 26bd8eb..7f7ba92 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -18,6 +18,7 @@ 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 \ -- cgit v1.2.3 From c7f87c27e88535403c0d97c7e3bdfea9efb90351 Mon Sep 17 00:00:00 2001 From: loki666 Date: Sat, 21 Apr 2018 12:55:20 +0200 Subject: android: add build rules for rt --- android/jni/Android.mk | 29 ++++++++++++++++++++++++++++- android/jni/Application.mk | 2 +- 2 files changed, 29 insertions(+), 2 deletions(-) (limited to 'android/jni') diff --git a/android/jni/Android.mk b/android/jni/Android.mk index 7f7ba92..203699f 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 := \ @@ -28,3 +28,30 @@ LOCAL_SRC_FILES := src/adldata.cpp \ 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 \ + 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) \ No newline at end of file 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 -- cgit v1.2.3