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/jni/Application.mk | |
| 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/jni/Application.mk')
| -rw-r--r-- | android/jni/Application.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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 |