sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Have bit_array as a distinct library

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-02-23 02:57:28 +01:00
parent 563df57177
commit e45dfbc50b
5 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common.mk
View file

@ -128,6 +128,7 @@ SFIZZ_SOURCES = \
SFIZZ_C_FLAGS += \ SFIZZ_C_FLAGS += \
-I$(SFIZZ_DIR)/src/sfizz \ -I$(SFIZZ_DIR)/src/sfizz \
-I$(SFIZZ_DIR)/src/sfizz/utility/bit_array \
-I$(SFIZZ_DIR)/src/sfizz/utility/spin_mutex -I$(SFIZZ_DIR)/src/sfizz/utility/spin_mutex
# Pkg-config dependency # Pkg-config dependency

7
src/CMakeLists.txt
View file

@ -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) target_link_libraries(sfizz_spin_mutex PRIVATE sfizz::atomic_queue)
add_library(sfizz::spin_mutex ALIAS sfizz_spin_mutex) 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) # Sfizz internals (use this for testing)
add_library(sfizz_internal STATIC) add_library(sfizz_internal STATIC)
add_library(sfizz::internal ALIAS sfizz_internal) add_library(sfizz::internal ALIAS sfizz_internal)
target_sources(sfizz_internal PRIVATE ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES}) target_sources(sfizz_internal PRIVATE ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES})
target_include_directories(sfizz_internal PUBLIC "." "sfizz") target_include_directories(sfizz_internal PUBLIC "." "sfizz")
target_link_libraries(sfizz_internal 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) 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) if(SFIZZ_USE_SNDFILE)
target_compile_definitions(sfizz_internal PUBLIC "SFIZZ_USE_SNDFILE=1") target_compile_definitions(sfizz_internal PUBLIC "SFIZZ_USE_SNDFILE=1")

2
src/sfizz/SynthPrivate.h
View file

@ -5,12 +5,12 @@
#include "SisterVoiceRing.h" #include "SisterVoiceRing.h"
#include "TriggerEvent.h" #include "TriggerEvent.h"
#include "VoiceManager.h" #include "VoiceManager.h"
#include "BitArray.h"
#include "modulations/sources/ADSREnvelope.h" #include "modulations/sources/ADSREnvelope.h"
#include "modulations/sources/Controller.h" #include "modulations/sources/Controller.h"
#include "modulations/sources/FlexEnvelope.h" #include "modulations/sources/FlexEnvelope.h"
#include "modulations/sources/ChannelAftertouch.h" #include "modulations/sources/ChannelAftertouch.h"
#include "modulations/sources/LFO.h" #include "modulations/sources/LFO.h"
#include "utility/BitArray.h"
namespace sfz { namespace sfz {

0
src/sfizz/utility/BitArray.h → src/sfizz/utility/bit_array/BitArray.h
View file

2
tests/SynthT.cpp
View file

@ -8,7 +8,7 @@
#include "sfizz/SisterVoiceRing.h" #include "sfizz/SisterVoiceRing.h"
#include "sfizz/SfzHelpers.h" #include "sfizz/SfzHelpers.h"
#include "sfizz/utility/NumericId.h" #include "sfizz/utility/NumericId.h"
#include "sfizz/utility/BitArray.h" #include "BitArray.h"
#include "TestHelpers.h" #include "TestHelpers.h"
#include <algorithm> #include <algorithm>
#include "catch2/catch.hpp" #include "catch2/catch.hpp"