Some parser fixes

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)

src/sfizz/parser/ParserPrivate.h

@@ -9,6 +9,7 @@
 #include "ghc/fs_std.hpp"
 #include "absl/strings/string_view.h"
 #include <string>
+#include <fstream>
 
 namespace sfz {
 

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()
 

tests/DemoParser.cpp

@@ -1,5 +1,5 @@
 #include "ui_DemoParser.h"
-#include "sfizz/parser/Parser.h"
+#include "parser/Parser.h"
 #include <QApplication>
 #include <QTimer>
 #include <QTemporaryFile>