diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 139f3a8a..58b366e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -19,8 +19,6 @@ set (SFIZZ_SOURCES sfizz/Curve.cpp sfizz/Wavetables.cpp sfizz/Effects.cpp - sfizz/parser/Parser.cpp - sfizz/parser/ParserPrivate.cpp sfizz/effects/Nothing.cpp sfizz/effects/Filter.cpp sfizz/effects/Eq.cpp @@ -31,10 +29,12 @@ include (SfizzSIMDSourceFiles) # Parser core library add_library (sfizz_parser STATIC) -target_sources (sfizz_parser PRIVATE sfizz/Parser.cpp sfizz/Opcode.cpp sfizz/SfzHelpers.cpp) +target_sources (sfizz_parser PRIVATE + sfizz/Parser.cpp sfizz/Opcode.cpp sfizz/SfzHelpers.cpp + sfizz/parser/Parser.cpp sfizz/parser/ParserPrivate.cpp) target_include_directories (sfizz_parser PUBLIC sfizz) target_include_directories (sfizz_parser PUBLIC external) -target_link_libraries (sfizz_parser PUBLIC absl::strings) +target_link_libraries (sfizz_parser PUBLIC absl::strings PRIVATE absl::flat_hash_map) # Sfizz static library add_library(sfizz_static STATIC) diff --git a/src/sfizz/parser/ParserPrivate.h b/src/sfizz/parser/ParserPrivate.h index 39aeca8e..a0c2fecd 100644 --- a/src/sfizz/parser/ParserPrivate.h +++ b/src/sfizz/parser/ParserPrivate.h @@ -9,6 +9,7 @@ #include "ghc/fs_std.hpp" #include "absl/strings/string_view.h" #include +#include namespace sfz { diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 29cd312e..30db1c1e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -57,7 +57,7 @@ if(JACK_FOUND AND TARGET Qt5::Widgets) set_target_properties(sfizz_demo_wavetables PROPERTIES AUTOUIC ON) add_executable(sfizz_demo_parser DemoParser.cpp) - target_link_libraries(sfizz_demo_parser PRIVATE sfizz::sfizz Qt5::Widgets) + target_link_libraries(sfizz_demo_parser PRIVATE sfizz_parser Qt5::Widgets) set_target_properties(sfizz_demo_parser PROPERTIES AUTOUIC ON) endif() diff --git a/tests/DemoParser.cpp b/tests/DemoParser.cpp index fa0c5078..42893a76 100644 --- a/tests/DemoParser.cpp +++ b/tests/DemoParser.cpp @@ -1,5 +1,5 @@ #include "ui_DemoParser.h" -#include "sfizz/parser/Parser.h" +#include "parser/Parser.h" #include #include #include