From d44c4c73182cc21d6984e0188c4e45e0350b6e7a Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Mon, 23 Apr 2018 00:45:07 +0300 Subject: Fixed Android build --- src/adlmidi_private.hpp | 2 +- src/chips/dosbox_opl3.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index 0fabf35..fc54457 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -88,7 +88,7 @@ typedef int32_t ssize_t; #include #include #include -#if !(defined(__APPLE__) && defined(__GLIBCXX__)) +#if !(defined(__APPLE__) && defined(__GLIBCXX__)) && !defined(__ANDROID__) #include //PRId32, PRIu32, etc. #else #include diff --git a/src/chips/dosbox_opl3.cpp b/src/chips/dosbox_opl3.cpp index 24c1c44..e748b85 100644 --- a/src/chips/dosbox_opl3.cpp +++ b/src/chips/dosbox_opl3.cpp @@ -5,14 +5,14 @@ DosBoxOPL3::DosBoxOPL3() : OPLChipBase(), - m_chip(nullptr) + m_chip(NULL) { reset(); } DosBoxOPL3::DosBoxOPL3(const DosBoxOPL3 &c) : OPLChipBase(c), - m_chip(nullptr) + m_chip(NULL) { setRate(c.m_rate); } -- cgit v1.2.3 From 99af645d389f600de82a3ab428a39829346c4c0b Mon Sep 17 00:00:00 2001 From: loki666 Date: Mon, 23 Apr 2018 16:20:40 +0200 Subject: add simple CMakeLists for android --- android/CMakeLists.txt | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 android/CMakeLists.txt diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt new file mode 100644 index 0000000..87c95a8 --- /dev/null +++ b/android/CMakeLists.txt @@ -0,0 +1,34 @@ +cmake_minimum_required(VERSION 3.4.1) + +set(src_DIR ../src) +set(include_DIR ../include) + +set(libADLMIDI_sources + ${src_DIR}/adldata.cpp + ${src_DIR}/adlmidi_load.cpp + ${src_DIR}/adlmidi_midiplay.cpp + ${src_DIR}/adlmidi_mus2mid.c + ${src_DIR}/adlmidi_opl3.cpp + ${src_DIR}/adlmidi_private.cpp + ${src_DIR}/adlmidi_xmi2mid.c + ${src_DIR}/adlmidi.cpp + ${src_DIR}/wopl/wopl_file.c + ${src_DIR}/chips/dosbox_opl3.cpp + ${src_DIR}/chips/nuked_opl3_v174.cpp + ${src_DIR}/chips/nuked_opl3.cpp + ${src_DIR}/chips/opl_chip_base.cpp + ${src_DIR}/chips/dosbox/dbopl.cpp + ${src_DIR}/chips/nuked/nukedopl3_174.c + ${src_DIR}/chips/nuked/nukedopl3.c +) + +add_library(libADLMIDI SHARED ${libADLMIDI_sources}) + +# Specify directories which the compiler should look for headers +target_include_directories(libADLMIDI PRIVATE + ${include_DIR} +) + +target_include_directories(libADLMIDI INTERFACE + ${include_DIR} +) \ No newline at end of file -- cgit v1.2.3 From c014aedd155d366ecbfa507317647675181a813d Mon Sep 17 00:00:00 2001 From: Vitaly Novichkov Date: Wed, 25 Apr 2018 00:23:48 +0300 Subject: ReadME: Add release data and correct CMake options manual --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f6f1224..9fdfd22 100644 --- a/README.md +++ b/README.md @@ -59,12 +59,14 @@ sudo make install * **CMAKE_PREFIX_PATH** - destinition folder where libADLMIDI will be installed. On Linux it is /usr/local/ by default. * **CMAKE_BUILD_TYPE** - Build types: **Debug** or **Release** * **WITH_MIDIPLAY** - (ON/OFF, default OFF) Build demo MIDI player (Requires SDL2 and also pthread on Windows with MinGW) +* **WITH_VLC_PLUGIN** - (ON/OFF, default OFF) Compile VLC plugin. For now, works on Linux and VLC version 2.2.2. Support for newer VLC versions and other platforms comming soon! * **WITH_ADLMIDI2** - (ON/OFF, default OFF) Build Classic ADLMIDI MIDI player (Requires SDL2 on Linux and macOS, requires pthread on Windows with MinGW, SDL doesn't required on Windows. Also, the **WITH_CPP_EXTRAS** flag must be enabled) * **WITH_CPP_EXTRAS** - (ON/OFF, default OFF) Build libADLMIDI with some extra public features for C++ language (for example, instrument testing API is available for C++ only). * **WITH_OLD_UTILS** - (ON/OFF, default OFF) Build old utilities to dump some bank formats, made by original creator of ADLMIDI * **WITH_EMBEDDED_BANKS** - (ON/OFF, default ON) Enable or disable embedded banks (Original ADLMIDI and older versions of libADLMIDI are had embedded-only banks with no ability to load custom banks in runtime). * **WITH_GENADLDATA** - (ON/OFF, default OFF) Build and execute the utility which will rebuild the embedded banks database (which is an adldata.cpp file). -* **USE_DOSBOX_EMULATOR** - (ON/OFF, default OFF) Use DosBox emulator instead of current Nuked OPL3. This emulator has less accuracy, but it is well optimized for a work on slow devices such as older computers, embedded devices, or mobile device. +* **USE_DOSBOX_EMULATOR** - (ON/OFF, default ON) Enable support for DosBox 0.74 emulator. (Well-accurate and fast) +* **USE_NUKED_EMULATOR** - (ON/OFF, default ON) Enable support for Nuked OPL3 emulator. (Very-accurate, needs more CPU power) * **libADLMIDI_STATIC** - (ON/OFF, default ON) Build static library * **libADLMIDI_SHARED** - (ON/OFF, default OFF) Build shared library @@ -133,7 +135,7 @@ To build that example you will need to have installed SDL2 library. * Add support of MIDI Format 2 files (FL Studio made MIDI-files are wired and opening of those files making lossy of tempo and some meta-information events) # Changelog -## 1.3.2 dev +## 1.3.2 2018-04-24 * Added ability to disable MUS and XMI converters * Added ability to disable embedded MIDI sequencer to use library as RealTime synthesizer only or use any custom MIDI sequencer plugins. * Fixed blank instruments fallback in multi-bank support. When using non-zero bank, if instrument is blank, then, instrument will be taken from a root (I.e. zero bank). -- cgit v1.2.3