Have bit_array as a distinct library
This commit is contained in:
parent
563df57177
commit
e45dfbc50b
5 changed files with 9 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue