From e45dfbc50b3b43f57a470ed15718a655aa7fb7d1 Mon Sep 17 00:00:00 2001
From: Jean Pierre Cimalando <jp-dev@inbox.ru>
Date: Tue, 23 Feb 2021 02:57:28 +0100
Subject: [PATCH] Have bit_array as a distinct library

---
 common.mk                                    | 1 +
 src/CMakeLists.txt                           | 7 ++++++-
 src/sfizz/SynthPrivate.h                     | 2 +-
 src/sfizz/utility/{ => bit_array}/BitArray.h | 0
 tests/SynthT.cpp                             | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)
 rename src/sfizz/utility/{ => bit_array}/BitArray.h (100%)

diff --git a/common.mk b/common.mk
index ca23cad7..d27836e8 100644
--- a/common.mk
+++ b/common.mk
@@ -128,6 +128,7 @@ SFIZZ_SOURCES = \
 
 SFIZZ_C_FLAGS += \
     -I$(SFIZZ_DIR)/src/sfizz \
+    -I$(SFIZZ_DIR)/src/sfizz/utility/bit_array \
     -I$(SFIZZ_DIR)/src/sfizz/utility/spin_mutex
 
 # Pkg-config dependency
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b98cf69b..9779d698 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -252,13 +252,18 @@ target_include_directories(sfizz_spin_mutex PUBLIC sfizz/utility/spin_mutex)
 target_link_libraries(sfizz_spin_mutex PRIVATE sfizz::atomic_queue)
 add_library(sfizz::spin_mutex ALIAS sfizz_spin_mutex)
 
+# Sfizz bit array
+add_library(sfizz_bit_array INTERFACE)
+target_include_directories(sfizz_bit_array INTERFACE sfizz/utility/bit_array)
+add_library(sfizz::bit_array ALIAS sfizz_bit_array)
+
 # Sfizz internals (use this for testing)
 add_library(sfizz_internal STATIC)
 add_library(sfizz::internal ALIAS sfizz_internal)
 target_sources(sfizz_internal PRIVATE ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES})
 target_include_directories(sfizz_internal PUBLIC "." "sfizz")
 target_link_libraries(sfizz_internal
-    PUBLIC absl::strings absl::span sfizz::filesystem sfizz::atomic_queue sfizz::spin_mutex sfizz::simde
+    PUBLIC absl::strings absl::span sfizz::filesystem sfizz::atomic_queue sfizz::spin_mutex sfizz::bit_array sfizz::simde
     PRIVATE sfizz::parser sfizz::messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::hiir sfizz::kissfft sfizz::cephes sfizz::cpuid sfizz::threadpool sfizz::jsl sfizz::atomic)
 if(SFIZZ_USE_SNDFILE)
     target_compile_definitions(sfizz_internal PUBLIC "SFIZZ_USE_SNDFILE=1")
diff --git a/src/sfizz/SynthPrivate.h b/src/sfizz/SynthPrivate.h
index e0d3124a..aaf6f72a 100644
--- a/src/sfizz/SynthPrivate.h
+++ b/src/sfizz/SynthPrivate.h
@@ -5,12 +5,12 @@
 #include "SisterVoiceRing.h"
 #include "TriggerEvent.h"
 #include "VoiceManager.h"
+#include "BitArray.h"
 #include "modulations/sources/ADSREnvelope.h"
 #include "modulations/sources/Controller.h"
 #include "modulations/sources/FlexEnvelope.h"
 #include "modulations/sources/ChannelAftertouch.h"
 #include "modulations/sources/LFO.h"
-#include "utility/BitArray.h"
 
 namespace sfz {
 
diff --git a/src/sfizz/utility/BitArray.h b/src/sfizz/utility/bit_array/BitArray.h
similarity index 100%
rename from src/sfizz/utility/BitArray.h
rename to src/sfizz/utility/bit_array/BitArray.h
diff --git a/tests/SynthT.cpp b/tests/SynthT.cpp
index c21fcc9e..cd309176 100644
--- a/tests/SynthT.cpp
+++ b/tests/SynthT.cpp
@@ -8,7 +8,7 @@
 #include "sfizz/SisterVoiceRing.h"
 #include "sfizz/SfzHelpers.h"
 #include "sfizz/utility/NumericId.h"
-#include "sfizz/utility/BitArray.h"
+#include "BitArray.h"
 #include "TestHelpers.h"
 #include <algorithm>
 #include "catch2/catch.hpp"