From 043ba92381e3572fb6d58112b7bc31d6fd21fdd2 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <Wohlstand@users.noreply.github.com>
Date: Tue, 8 May 2018 13:14:25 +0300
Subject: CMake: Use different strategy to identify MinGW if
 CMAKE_CXX_COMPILER_ID doesn't gives "GNU"

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bda3e0b..dce3bd3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,9 +141,10 @@ if(WITH_EMBEDDED_BANKS)
         endif()
         if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
                 CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR
+                CMAKE_COMPILER_IS_MINGW)
             if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2)
-                message("Turned on C++11 on GCC/CLang/Intel")
+                message("Turned on C++11 on GCC/CLang/Intel/MinGW")
                 target_compile_options(gen_adldata PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
             endif()
         else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-- 
cgit v1.2.3


From 61991cfd68afd7531b3d865c7870b10fc4a43de6 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <Wohlstand@users.noreply.github.com>
Date: Tue, 8 May 2018 13:19:57 +0300
Subject: CMake: Another attempt to fix MinGW build

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dce3bd3..f175476 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,9 +139,10 @@ if(WITH_EMBEDDED_BANKS)
         if(NOT MSVC)
             target_link_libraries(gen_adldata pthread m stdc++)
         endif()
-        if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-                CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
+        if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
+                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
                 "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR
+                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR
                 CMAKE_COMPILER_IS_MINGW)
             if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2)
                 message("Turned on C++11 on GCC/CLang/Intel/MinGW")
-- 
cgit v1.2.3


From 25b65876d06ad252e0237a6c884d51d97a91da64 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <Wohlstand@users.noreply.github.com>
Date: Tue, 8 May 2018 13:24:21 +0300
Subject: CMake: third attempt to fix MinGW build

---
 CMakeLists.txt | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f175476..6a57b98 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ if(WITH_EMBEDDED_BANKS)
                 "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR
                 "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR
                 CMAKE_COMPILER_IS_MINGW)
-            if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2)
+            if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2)
                 message("Turned on C++11 on GCC/CLang/Intel/MinGW")
                 target_compile_options(gen_adldata PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
             endif()
@@ -375,10 +375,12 @@ if(WITH_ADLMIDI2)
         message(FATAL_ERROR "ADLMIDI2 Requires C++ Extras. Please enable WITH_CPP_EXTRAS option!")
     endif()
 
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR
-            CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR
-            "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
-        if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.2)
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR
+                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
+                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR
+                "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR
+                CMAKE_COMPILER_IS_MINGW)
+        if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2)
             message("Turned on C++11 on GCC/CLang/Intel")
             target_compile_options(adlmidi2 PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
         endif()
-- 
cgit v1.2.3


From 788c3f5211b0eb98d2bdcd6bfab1393dc551cda6 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <Wohlstand@users.noreply.github.com>
Date: Tue, 8 May 2018 13:31:16 +0300
Subject: CMake: Fourth attempt to fix MinGW build

---
 CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a57b98..d6dbd01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,7 +146,9 @@ if(WITH_EMBEDDED_BANKS)
                 CMAKE_COMPILER_IS_MINGW)
             if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2)
                 message("Turned on C++11 on GCC/CLang/Intel/MinGW")
-                target_compile_options(gen_adldata PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
+                set_target_properties(gen_adldata PROPERTIES
+                                      CXX_STANDARD 11
+                                      CXX_STANDARD_REQUIRED YES)
             endif()
         else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
             message("Turned on C++11 on MSVC")
@@ -382,7 +384,9 @@ if(WITH_ADLMIDI2)
                 CMAKE_COMPILER_IS_MINGW)
         if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2)
             message("Turned on C++11 on GCC/CLang/Intel")
-            target_compile_options(adlmidi2 PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=c++11>)
+            set_target_properties(gen_adldata PROPERTIES
+                                      CXX_STANDARD 11
+                                      CXX_STANDARD_REQUIRED YES)
         endif()
     else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         message("Turned on C++11 on MSVC")
-- 
cgit v1.2.3


From a8ec2f990a624136ca3eefa39e3e87e92aea5a2e Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Wed, 16 May 2018 03:37:59 +0300
Subject: CMake: Fixed build of ADLMIDI2 when GenAdlData is disabled

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6dbd01..43c97f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -384,7 +384,7 @@ if(WITH_ADLMIDI2)
                 CMAKE_COMPILER_IS_MINGW)
         if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2)
             message("Turned on C++11 on GCC/CLang/Intel")
-            set_target_properties(gen_adldata PROPERTIES
+            set_target_properties(adlmidi2 PROPERTIES
                                       CXX_STANDARD 11
                                       CXX_STANDARD_REQUIRED YES)
         endif()
-- 
cgit v1.2.3


From 5fdd39289affe341151839a48e227d51b08c4a25 Mon Sep 17 00:00:00 2001
From: JP Cimalando <jpcima@users.noreply.github.com>
Date: Tue, 15 May 2018 18:09:04 +0200
Subject: specialized hash table for bank number mappings

---
 CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43c97f9..e104d8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -488,6 +488,12 @@ install(FILES
         include/adlmidi.hpp
         DESTINATION include/)
 
+option(WITH_UNIT_TESTS "Enable unit testing" OFF)
+if(WITH_UNIT_TESTS)
+    enable_testing()
+    add_subdirectory(test)
+endif()
+
 message("==== libADLMIDI options ====")
 message("WITH_MIDIPLAY            = ${WITH_MIDIPLAY}")
 message("WITH_VLC_PLUGIN          = ${WITH_VLC_PLUGIN}")
@@ -506,4 +512,4 @@ message("WITH_XMI_SUPPORT         = ${WITH_XMI_SUPPORT}")
 message("libADLMIDI_STATIC        = ${libADLMIDI_STATIC}")
 message("libADLMIDI_SHARED        = ${libADLMIDI_SHARED}")
 message("EXAMPLE_SDL2_AUDIO       = ${EXAMPLE_SDL2_AUDIO}")
-
+message("WITH_UNIT_TESTS          = ${WITH_UNIT_TESTS}")
-- 
cgit v1.2.3


From 4cfba5ee6a404e71c3d7b86b7b1ec680c3d7521d Mon Sep 17 00:00:00 2001
From: Wohlstand <admin@wohlnet.ru>
Date: Sun, 3 Jun 2018 14:34:21 +0300
Subject: Fixed some warnings on MinGW

---
 CMakeLists.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e104d8d..ce162a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,13 @@ ELSEIF(NOT MSVC AND NOT MSDOS)
     set(LINK_FLAGS_RELEASE  "${LINK_FLAGS_RELEASE} -Wl,--gc-sections -Wl,-s")
 ENDIF()
 
-# Global optimization flags
 IF(NOT MSVC AND NOT MSDOS)
+# Global optimization flags
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-omit-frame-pointer")
+# Turn on all warnings
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELEASE} -Wall -Wextra")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wextra")
 ENDIF()
 
 if (CMAKE_BUILD_TYPE EQUAL "RELEASE")
@@ -45,7 +48,7 @@ function(set_legacy_standard destTarget)
         if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
             # Turn on warnings and legacy C/C++ standards to support more compilers
             target_compile_options(${destTarget} PRIVATE
-                $<$<COMPILE_LANGUAGE:C>:-Wall -pedantic -std=c90>
+                $<$<COMPILE_LANGUAGE:C>:-Wall -pedantic -std=c90 -Wno-long-long>
                 $<$<COMPILE_LANGUAGE:CXX>:-Wall -pedantic -std=gnu++98>
             )
         endif()
-- 
cgit v1.2.3


From e3cad2f46925ac0b9ae303bea68a5fe508e78bc9 Mon Sep 17 00:00:00 2001
From: JP Cimalando <jpcima@users.noreply.github.com>
Date: Sun, 3 Jun 2018 14:50:53 +0200
Subject: optional high-quality resampling

---
 CMakeLists.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce162a0..0bf7719 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,7 @@ option(WITH_CPP_EXTRAS      "Build with support for C++ extras (features are can
 option(WITH_MIDI_SEQUENCER  "Build with embedded MIDI sequencer. Disable this if you want use library in real-time MIDI drivers or plugins.)" ON)
 option(WITH_MUS_SUPPORT     "Build with support for DMX MUS files)" ON)
 option(WITH_XMI_SUPPORT     "Build with support for AIL XMI files)" ON)
+option(WITH_HQ_RESAMPLER    "Build with support for high quality resampling" OFF)
 
 option(libADLMIDI_STATIC   "Build static library of libADLMIDI" ON)
 option(libADLMIDI_SHARED   "Build shared library of libADLMIDI" OFF)
@@ -480,6 +481,17 @@ if(WITH_VLC_PLUGIN)
 
 endif()
 
+if(WITH_HQ_RESAMPLER)
+  find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
+  add_definitions(-DADLMIDI_ENABLE_HQ_RESAMPLER)
+  if(libADLMIDI_SHARED)
+    target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
+  endif()
+  if(libADLMIDI_STATIC)
+    target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
+  endif()
+endif()
+
 install(TARGETS ${libADLMIDI_INSTALLS}
         RUNTIME DESTINATION "bin"
         LIBRARY DESTINATION "lib"
@@ -512,6 +524,7 @@ message("WITH_MIDI_SEQUENCER      = ${WITH_MIDI_SEQUENCER}")
 message("WITH_CPP_EXTRAS          = ${WITH_CPP_EXTRAS}")
 message("WITH_MUS_SUPPORT         = ${WITH_MUS_SUPPORT}")
 message("WITH_XMI_SUPPORT         = ${WITH_XMI_SUPPORT}")
+message("WITH_HQ_RESAMPLER        = ${WITH_HQ_RESAMPLER}")
 message("libADLMIDI_STATIC        = ${libADLMIDI_STATIC}")
 message("libADLMIDI_SHARED        = ${libADLMIDI_SHARED}")
 message("EXAMPLE_SDL2_AUDIO       = ${EXAMPLE_SDL2_AUDIO}")
-- 
cgit v1.2.3


From 64254a351652011b00f700b27863ec6659205273 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 3 Jun 2018 18:36:22 +0300
Subject: Fixed warnings in the utils

---
 CMakeLists.txt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0bf7719..5520399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -277,9 +277,9 @@ endif()
 
 add_library(ADLMIDI INTERFACE)
 if(libADLMIDI_SHARED)
-  target_link_libraries(ADLMIDI INTERFACE ADLMIDI_shared)
+    target_link_libraries(ADLMIDI INTERFACE ADLMIDI_shared)
 else()
-  target_link_libraries(ADLMIDI INTERFACE ADLMIDI_static)
+    target_link_libraries(ADLMIDI INTERFACE ADLMIDI_static)
 endif()
 
 if(WITH_MIDIPLAY)
@@ -339,6 +339,8 @@ if(WITH_MIDIPLAY)
 endif()
 
 if(WITH_ADLMIDI2)
+    find_package(OpenMP)
+
     if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
         find_library(SDL2_LIBRARY SDL2 REQUIRED)
         include_directories(${SDL2_INCLUDE_DIR})
@@ -350,6 +352,7 @@ if(WITH_ADLMIDI2)
         set(ADLMIDI2_VIDEO_OUT_SUPPORT "TRUE")
     endif()
 
+
     set(adlmidi2_src)
     list(APPEND adlmidi2_src
         ${libADLMIDI_SOURCE_DIR}/utils/adlmidi-2/midiplay.cc
@@ -362,11 +365,11 @@ if(WITH_ADLMIDI2)
     add_executable(adlmidi2 ${adlmidi2_src})
 
     if(ADLMIDI2_HAS_PUZZLE_GAME)
-        target_compile_options(adlmidi2 PUBLIC "-DSUPPORT_PUZZLE_GAME")
+        target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_PUZZLE_GAME")
     endif()
 
     if(ADLMIDI2_VIDEO_OUT_SUPPORT)
-        target_compile_options(adlmidi2 PUBLIC "-DSUPPORT_VIDEO_OUTPUT")
+        target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_VIDEO_OUTPUT")
     endif()
 
     if(WIN32)
@@ -392,6 +395,10 @@ if(WITH_ADLMIDI2)
                                       CXX_STANDARD 11
                                       CXX_STANDARD_REQUIRED YES)
         endif()
+        if(OPENMP_FOUND)
+            target_compile_options(adlmidi2 PUBLIC "-fopenmp")
+            target_link_libraries(adlmidi2 "-fopenmp")
+        endif()
     else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         message("Turned on C++11 on MSVC")
         target_compile_options(adlmidi2 PUBLIC "/std:c++latest")
@@ -400,7 +407,7 @@ if(WITH_ADLMIDI2)
     if(libADLMIDI_SHARED)
         add_dependencies(adlmidi2 ADLMIDI_shared)
         # ========= WIP =========
-        # set_target_properties(adlmidiplay PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'")
+        set_target_properties(adlmidi2 PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'")
     else()
         if(NOT libADLMIDI_STATIC)
             message(FATAL_ERROR "libADLMIDI is required to be built!")
-- 
cgit v1.2.3


From f6249a750f4dcb246c30ee97f5a13ca5e4c7a466 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 3 Jun 2018 18:46:59 +0300
Subject: Small beautifying in CMakeLists.txt

---
 CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5520399..29b5110 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -489,14 +489,14 @@ if(WITH_VLC_PLUGIN)
 endif()
 
 if(WITH_HQ_RESAMPLER)
-  find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
-  add_definitions(-DADLMIDI_ENABLE_HQ_RESAMPLER)
-  if(libADLMIDI_SHARED)
-    target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
-  endif()
-  if(libADLMIDI_STATIC)
-    target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
-  endif()
+    find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
+    add_definitions(-DADLMIDI_ENABLE_HQ_RESAMPLER)
+    if(libADLMIDI_SHARED)
+        target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
+    endif()
+    if(libADLMIDI_STATIC)
+        target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
+    endif()
 endif()
 
 install(TARGETS ${libADLMIDI_INSTALLS}
-- 
cgit v1.2.3


From 2c8961252ee2ff91cda38b4dc9b36a957997091a Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 3 Jun 2018 19:03:49 +0300
Subject: Re-Order CMake flags and info, and update the changes log

---
 CMakeLists.txt | 60 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 33 insertions(+), 27 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29b5110..21fd643 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,27 +56,29 @@ function(set_legacy_standard destTarget)
 endfunction()
 #===========================================================================================
 
-option(WITH_MIDIPLAY        "Build also demo MIDI player" OFF)
-option(MIDIPLAY_WAVE_ONLY   "Build Demo MIDI player without support of real time playing. It will output into WAV only." OFF)
-option(WITH_ADLMIDI2        "Build also classic ADLMIDI player [EXPERIMENTAL]" OFF)
-option(WITH_VLC_PLUGIN      "Build also a plugin for VLC Media Player" OFF)
-option(WITH_OLD_UTILS       "Build also old utilities" OFF)
-option(WITH_EMBEDDED_BANKS  "Use embedded banks" ON)
-option(WITH_GENADLDATA      "Build and run full rebuild of embedded banks cache" OFF)
-option(WITH_GENADLDATA_COMMENTS "Enable comments in generated ADLDATA cache file" OFF)
-option(USE_DOSBOX_EMULATOR  "Use DosBox 0.74 OPL3 emulator (semi-accurate, suggested for slow or mobile platforms)" ON)
-option(USE_NUKED_EMULATOR   "Use Nuked OPL3 emulator (most accurate, powerful)" ON)
+option(libADLMIDI_STATIC   "Build static library of libADLMIDI" ON)
+option(libADLMIDI_SHARED   "Build shared library of libADLMIDI" OFF)
+
 option(WITH_CPP_EXTRAS      "Build with support for C++ extras (features are can be found in 'adlmidi.hpp' header)" OFF)
 option(WITH_MIDI_SEQUENCER  "Build with embedded MIDI sequencer. Disable this if you want use library in real-time MIDI drivers or plugins.)" ON)
+option(WITH_EMBEDDED_BANKS  "Use embedded banks" ON)
+option(WITH_HQ_RESAMPLER    "Build with support for high quality resampling" OFF)
 option(WITH_MUS_SUPPORT     "Build with support for DMX MUS files)" ON)
 option(WITH_XMI_SUPPORT     "Build with support for AIL XMI files)" ON)
-option(WITH_HQ_RESAMPLER    "Build with support for high quality resampling" OFF)
+option(USE_DOSBOX_EMULATOR  "Use DosBox 0.74 OPL3 emulator (semi-accurate, suggested for slow or mobile platforms)" ON)
+option(USE_NUKED_EMULATOR   "Use Nuked OPL3 emulator (most accurate, powerful)" ON)
 
-option(libADLMIDI_STATIC   "Build static library of libADLMIDI" ON)
-option(libADLMIDI_SHARED   "Build shared library of libADLMIDI" OFF)
+option(WITH_GENADLDATA      "Build and run full rebuild of embedded banks cache" OFF)
+option(WITH_GENADLDATA_COMMENTS "Enable comments in generated ADLDATA cache file" OFF)
 
+option(WITH_MIDIPLAY        "Build also demo MIDI player" OFF)
+option(MIDIPLAY_WAVE_ONLY   "Build Demo MIDI player without support of real time playing. It will output into WAV only." OFF)
+option(WITH_ADLMIDI2        "Build also classic ADLMIDI player [EXPERIMENTAL]" OFF)
+option(WITH_VLC_PLUGIN      "Build also a plugin for VLC Media Player" OFF)
+option(WITH_OLD_UTILS       "Build also old utilities" OFF)
 option(EXAMPLE_SDL2_AUDIO   "Build also a simple SDL2 demo MIDI player" OFF)
 
+
 if(CMAKE_VERSION VERSION_EQUAL "3.1" OR CMAKE_VERSION VERSION_GREATER "3.1")
     set(CMAKE_CXX_STANDARD 11)
 endif()
@@ -517,22 +519,26 @@ if(WITH_UNIT_TESTS)
 endif()
 
 message("==== libADLMIDI options ====")
+message("libADLMIDI_STATIC        = ${libADLMIDI_STATIC}")
+message("libADLMIDI_SHARED        = ${libADLMIDI_SHARED}")
+message("WITH_UNIT_TESTS          = ${WITH_UNIT_TESTS}")
+
+message("WITH_CPP_EXTRAS          = ${WITH_CPP_EXTRAS}")
+message("WITH_MIDI_SEQUENCER      = ${WITH_MIDI_SEQUENCER}")
+message("WITH_EMBEDDED_BANKS      = ${WITH_EMBEDDED_BANKS}")
+message("WITH_HQ_RESAMPLER        = ${WITH_HQ_RESAMPLER}")
+message("WITH_MUS_SUPPORT         = ${WITH_MUS_SUPPORT}")
+message("WITH_XMI_SUPPORT         = ${WITH_XMI_SUPPORT}")
+message("USE_DOSBOX_EMULATOR      = ${USE_DOSBOX_EMULATOR}")
+message("USE_NUKED_EMULATOR       = ${USE_NUKED_EMULATOR}")
+
+message("===== Utils and extras =====")
+message("WITH_GENADLDATA          = ${WITH_GENADLDATA}")
+message("WITH_GENADLDATA_COMMENTS = ${WITH_GENADLDATA_COMMENTS}")
+
 message("WITH_MIDIPLAY            = ${WITH_MIDIPLAY}")
-message("WITH_VLC_PLUGIN          = ${WITH_VLC_PLUGIN}")
 message("MIDIPLAY_WAVE_ONLY       = ${MIDIPLAY_WAVE_ONLY}")
 message("WITH_ADLMIDI2            = ${WITH_ADLMIDI2}")
+message("WITH_VLC_PLUGIN          = ${WITH_VLC_PLUGIN}")
 message("WITH_OLD_UTILS           = ${WITH_OLD_UTILS}")
-message("WITH_EMBEDDED_BANKS      = ${WITH_EMBEDDED_BANKS}")
-message("WITH_GENADLDATA          = ${WITH_GENADLDATA}")
-message("WITH_GENADLDATA_COMMENTS = ${WITH_GENADLDATA_COMMENTS}")
-message("USE_DOSBOX_EMULATOR      = ${USE_DOSBOX_EMULATOR}")
-message("USE_NUKED_EMULATOR       = ${USE_NUKED_EMULATOR}")
-message("WITH_MIDI_SEQUENCER      = ${WITH_MIDI_SEQUENCER}")
-message("WITH_CPP_EXTRAS          = ${WITH_CPP_EXTRAS}")
-message("WITH_MUS_SUPPORT         = ${WITH_MUS_SUPPORT}")
-message("WITH_XMI_SUPPORT         = ${WITH_XMI_SUPPORT}")
-message("WITH_HQ_RESAMPLER        = ${WITH_HQ_RESAMPLER}")
-message("libADLMIDI_STATIC        = ${libADLMIDI_STATIC}")
-message("libADLMIDI_SHARED        = ${libADLMIDI_SHARED}")
 message("EXAMPLE_SDL2_AUDIO       = ${EXAMPLE_SDL2_AUDIO}")
-message("WITH_UNIT_TESTS          = ${WITH_UNIT_TESTS}")
-- 
cgit v1.2.3


From 6fd0fdaae724cc584755b2a797999f7e3a1bc28b Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Mon, 4 Jun 2018 02:25:34 +0300
Subject: Fix the debug build

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21fd643..156e8c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,8 +16,8 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-omit-frame-pointer")
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-omit-frame-pointer")
 # Turn on all warnings
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_RELEASE} -Wall -Wextra")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_RELEASE} -Wall -Wextra")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
 if (CMAKE_BUILD_TYPE EQUAL "RELEASE")
-- 
cgit v1.2.3


From 7cfe4dbcef738681b5445aa14b35fc1a6f8ff001 Mon Sep 17 00:00:00 2001
From: JP Cimalando <jpcima@users.noreply.github.com>
Date: Thu, 7 Jun 2018 07:21:29 +0200
Subject: chips: create a common method set for generation and resampling

---
 CMakeLists.txt | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 156e8c0..92ecb7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,10 +113,6 @@ if(WITH_EMBEDDED_BANKS)
             ${libADLMIDI_SOURCE_DIR}/utils/gen_adldata/ini/ini_processing.cpp
         )
 
-        list(APPEND GEN_ADLDATA_SRC
-            ${libADLMIDI_SOURCE_DIR}/src/chips/opl_chip_base.cpp
-        )
-
         if(USE_DOSBOX_EMULATOR)
             set(HAS_EMULATOR TRUE)
             list(APPEND GEN_ADLDATA_SRC
@@ -203,10 +199,6 @@ else()
 endif()
 
 if(NOT DJGPP AND NOT MSDOS)
-    list(APPEND libADLMIDI_SOURCES
-        ${libADLMIDI_SOURCE_DIR}/src/chips/opl_chip_base.cpp
-    )
-
     if(USE_DOSBOX_EMULATOR)
         set(HAS_EMULATOR TRUE)
         list(APPEND libADLMIDI_SOURCES
-- 
cgit v1.2.3


From 46a5736f096e24326bec47215bd8203d94b4f789 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sat, 16 Jun 2018 19:40:26 +0300
Subject: Upgrated measurer algorithm and re-generated full embedded banks
 database

---
 CMakeLists.txt | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92ecb7c..d171572 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,14 @@ if(WITH_OLD_UTILS)
     list(APPEND libADLMIDI_INSTALLS adldumpmiles)
 endif()
 
+if(WITH_ADLMIDI2 OR (WITH_EMBEDDED_BANKS AND WITH_GENADLDATA))
+    find_package(OpenMP)
+endif()
+
+if(WITH_HQ_RESAMPLER)
+    find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
+endif()
+
 if(WITH_EMBEDDED_BANKS)
     if(WITH_GENADLDATA)
         set(GEN_ADLDATA_SRC)
@@ -151,6 +159,10 @@ if(WITH_EMBEDDED_BANKS)
                 set_target_properties(gen_adldata PROPERTIES
                                       CXX_STANDARD 11
                                       CXX_STANDARD_REQUIRED YES)
+                if(OPENMP_FOUND)
+                    target_compile_options(gen_adldata PUBLIC "-fopenmp")
+                    target_link_libraries(gen_adldata "-fopenmp")
+                endif()
             endif()
         else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
             message("Turned on C++11 on MSVC")
@@ -161,12 +173,16 @@ if(WITH_EMBEDDED_BANKS)
             target_compile_options(gen_adldata PUBLIC "-DADLDATA_WITH_COMMENTS")
         endif()
 
-        add_custom_target(
-            gen-adldata-run
-            COMMAND gen_adldata ${libADLMIDI_SOURCE_DIR}/src/adldata.cpp
+        set(ADLDATA_DATABASE
+            "${libADLMIDI_SOURCE_DIR}/src/adldata.cpp"
+        )
+        add_custom_target(gen-adldata-run #OUTPUT ${ADLDATA_DATABASE}
+            COMMAND gen_adldata "${ADLDATA_DATABASE}"
             WORKING_DIRECTORY ${libADLMIDI_SOURCE_DIR}
+            DEPENDS gen_adldata "${libADLMIDI_SOURCE_DIR}/banks.ini"
+            COMMENT "Running Embedded FM banks database generation"
+            VERBATIM
         )
-        add_dependencies(gen-adldata-run gen_adldata)
     endif()
 endif()
 
@@ -333,8 +349,6 @@ if(WITH_MIDIPLAY)
 endif()
 
 if(WITH_ADLMIDI2)
-    find_package(OpenMP)
-
     if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
         find_library(SDL2_LIBRARY SDL2 REQUIRED)
         include_directories(${SDL2_INCLUDE_DIR})
@@ -483,12 +497,12 @@ if(WITH_VLC_PLUGIN)
 endif()
 
 if(WITH_HQ_RESAMPLER)
-    find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
-    add_definitions(-DADLMIDI_ENABLE_HQ_RESAMPLER)
     if(libADLMIDI_SHARED)
+        target_compile_definitions(ADLMIDI_shared PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER)
         target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
     endif()
     if(libADLMIDI_STATIC)
+        target_compile_definitions(ADLMIDI_static PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER)
         target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
     endif()
 endif()
-- 
cgit v1.2.3


From ac2881c53926e0fab4d771d46e7d47694026799a Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 17 Jun 2018 20:43:06 +0300
Subject: Small correction of CMake build

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d171572..2901ba5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.2)
-project (libADLMIDI)
+project (libADLMIDI C CXX)
 
 #===========================================================================================
 # Strip garbage
@@ -20,7 +20,8 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
-if (CMAKE_BUILD_TYPE EQUAL "RELEASE")
+string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+if(CMAKE_BUILD_TYPE_LOWER EQUAL "release")
     add_definitions(-DNDEBUG)
 ENDIF()
 
-- 
cgit v1.2.3


From 2f5d59e3052e280a8dbcc2f04685753553d10281 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 17 Jun 2018 21:01:21 +0300
Subject: Set Release when CMAKE_BUILD_TYPE is not defined

---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2901ba5..899839f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
+if(CMAKE_BUILD_TYPE STREQUAL "")
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
 string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
 if(CMAKE_BUILD_TYPE_LOWER EQUAL "release")
     add_definitions(-DNDEBUG)
-- 
cgit v1.2.3


From c7f8dbee64d404e66e5d89946027794eac5c5421 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Mon, 18 Jun 2018 01:45:58 +0300
Subject: CMake: Fixed configure when no CMAKE_BUILD_TYPE was defined

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 899839f..c26d5ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
-if(CMAKE_BUILD_TYPE STREQUAL "")
+if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-- 
cgit v1.2.3