Merge pull request #582 from jpcima/cleanup

More CMake cleanup

.gitmodules

@@ -35,3 +35,7 @@
 	path = vst/external/sfzt_auwrapper
 	url = https://github.com/sfztools/sfzt_auwrapper.git
 	shallow = true
+[submodule "external/filesystem"]
+	path = external/filesystem
+	url = https://github.com/gulrak/filesystem.git
+	shallow = true

benchmarks/CMakeLists.txt

@@ -20,19 +20,18 @@ endif()
 
 add_library(bm_simd STATIC ${BENCHMARK_SIMD_SOURCES})
 target_link_libraries(bm_simd PRIVATE absl::span sfizz::cpuid)
-target_include_directories(bm_simd PRIVATE ../src/external)
 add_library(bm_ftz STATIC ../src/sfizz/ScopedFTZ.cpp)
 
 macro(sfizz_add_benchmark TARGET)
     add_executable("${TARGET}" ${ARGN})
     target_link_libraries("${TARGET}"
-        PRIVATE absl::span absl::algorithm
+        PRIVATE sfizz::filesystem absl::span absl::algorithm
         PRIVATE benchmark::benchmark benchmark::benchmark_main
         PRIVATE bm_simd bm_ftz)
     if(LIBATOMIC_FOUND)
         target_link_libraries("${TARGET}" PRIVATE atomic)
     endif()
-    target_include_directories("${TARGET}" PRIVATE ../src/sfizz ../src/external)
+    target_include_directories("${TARGET}" PRIVATE ../src/sfizz)
     sfizz_enable_fast_math("${TARGET}")
 endmacro()
 
@@ -75,7 +74,7 @@ target_link_libraries(bm_powerFollower PRIVATE sfizz::sfizz)
 
 if(TARGET sfizz::samplerate)
 sfizz_add_benchmark(bm_resample BM_resample.cpp ${BENCHMARK_SIMD_SOURCES})
-target_link_libraries(bm_resample PRIVATE sfizz::samplerate sfizz::sndfile sfizz::cpuid)
+target_link_libraries(bm_resample PRIVATE sfizz::samplerate sfizz::sndfile sfizz::cpuid sfizz::hiir)
 endif()
 
 sfizz_add_benchmark(bm_envelopes BM_envelopes.cpp)
@@ -95,7 +94,7 @@ sfizz_add_benchmark(bm_readChunkFlac BM_readChunkFlac.cpp)
 target_link_libraries(bm_readChunkFlac PRIVATE sfizz::sndfile)
 
 sfizz_add_benchmark(bm_resampleChunk BM_resampleChunk.cpp)
-target_link_libraries(bm_resampleChunk PRIVATE sfizz::sndfile)
+target_link_libraries(bm_resampleChunk PRIVATE sfizz::sndfile sfizz::hiir)
 
 sfizz_add_benchmark(bm_interpolators BM_interpolators.cpp)
 

cmake/SfizzConfig.cmake

@@ -154,6 +154,14 @@ add_library(sfizz_tunings STATIC "src/external/tunings/src/Tunings.cpp")
 add_library(sfizz::tunings ALIAS sfizz_tunings)
 target_include_directories(sfizz_tunings PUBLIC "src/external/tunings/include")
 
+add_library(sfizz_hiir INTERFACE)
+add_library(sfizz::hiir ALIAS sfizz_hiir)
+target_include_directories(sfizz_hiir INTERFACE "src/external/hiir")
+
+add_library(sfizz_filesystem INTERFACE)
+add_library(sfizz::filesystem ALIAS sfizz_filesystem)
+target_include_directories(sfizz_filesystem INTERFACE "external/filesystem/include")
+
 add_library(sfizz_atomic INTERFACE)
 add_library(sfizz::atomic ALIAS sfizz_atomic)
 if(UNIX AND NOT APPLE)

common.mk

@@ -126,7 +126,6 @@ SFIZZ_SOURCES = \
 ### Other internal
 
 SFIZZ_C_FLAGS += -I$(SFIZZ_DIR)/src/sfizz
-SFIZZ_C_FLAGS += -I$(SFIZZ_DIR)/src/external
 
 # Pkg-config dependency
 
@@ -175,6 +174,14 @@ SFIZZ_CXX_FLAGS += \
 	-I$(SFIZZ_DIR)/external/st_audiofile/thirdparty/libaiff
 endif
 
+# hiir dependency
+
+SFIZZ_CXX_FLAGS += -I$(SFIZZ_DIR)/src/external/hiir
+
+# ghc::filesystem dependency
+
+SFIZZ_CXX_FLAGS += -I$(SFIZZ_DIR)/external/filesystem/include
+
 ### Abseil dependency
 
 SFIZZ_C_FLAGS += -I$(SFIZZ_DIR)/external/abseil-cpp

demos/CMakeLists.txt

@@ -37,10 +37,10 @@ if(TARGET Qt5::Widgets)
 endif()
 
 add_executable(eq_apply EQ.cpp)
-target_link_libraries(eq_apply PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts)
+target_link_libraries(eq_apply PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts sfizz::filesystem)
 
 add_executable(filter_apply Filter.cpp)
-target_link_libraries(filter_apply PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts)
+target_link_libraries(filter_apply PRIVATE sfizz::sfizz sfizz::sndfile sfizz::cxxopts sfizz::filesystem)
 
 add_executable(sfizz_plot_curve PlotCurve.cpp)
 target_link_libraries(sfizz_plot_curve PRIVATE sfizz::sfizz)

editor/CMakeLists.txt

@@ -41,8 +41,9 @@ add_library(sfizz_editor STATIC EXCLUDE_FROM_ALL
     src/editor/layout/main.hpp
     src/editor/utility/vstgui_after.h
     src/editor/utility/vstgui_before.h)
+add_library(sfizz::editor ALIAS sfizz_editor)
 target_include_directories(sfizz_editor PUBLIC "src")
-target_link_libraries(sfizz_editor PUBLIC sfizz_messaging)
+target_link_libraries(sfizz_editor PUBLIC sfizz::messaging)
 target_link_libraries(sfizz_editor PRIVATE sfizz::vstgui)
 target_link_libraries(sfizz_editor PUBLIC absl::strings)
 if(APPLE)
@@ -69,7 +70,7 @@ else()
     target_include_directories(sfizz_editor PRIVATE ${sfizz-gio_INCLUDE_DIRS})
     target_link_libraries(sfizz_editor PRIVATE ${sfizz-gio_LIBRARIES})
 endif()
-target_include_directories(sfizz_editor PRIVATE "../src/external") # ghc::filesystem
+target_link_libraries(sfizz_editor PRIVATE sfizz::filesystem)
 
 # layout tool
 if(NOT CMAKE_CROSSCOMPILING)

external/filesystem

@@ -0,0 +1 @@
+Subproject commit 1edf4a333930f126f5dcd2f7919f0bf4fa3acecc

lv2/CMakeLists.txt

@@ -29,7 +29,7 @@ if(SFIZZ_LV2_UI)
         ${PROJECT_NAME}_ui.cpp
         vstgui_helpers.h
         vstgui_helpers.cpp)
-    target_link_libraries(${LV2PLUGIN_PRJ_NAME}_ui sfizz_editor sfizz::vstgui)
+    target_link_libraries(${LV2PLUGIN_PRJ_NAME}_ui sfizz::editor sfizz::vstgui)
 endif()
 
 # Explicitely strip all symbols on Linux but lv2_descriptor()

scripts/run_clang_tidy.sh

@@ -30,7 +30,7 @@ clang-tidy \
   vst/SfizzVstProcessor.cpp \
   vst/SfizzVstEditor.cpp \
   vst/SfizzVstState.cpp \
-  -- -Iexternal/abseil-cpp -Iexternal/jsl/include -Isrc/external -Isrc/external/pugixml/src \
+  -- -Iexternal/abseil-cpp -Iexternal/jsl/include -Iexternal/filesystem/include -Isrc/external/hiir -Isrc/external/pugixml/src \
      -Iexternal/st_audiofile/src -Iexternal/st_audiofile/thirdparty/dr_libs \
       -Isrc/sfizz -Isrc -Isrc/external/spline -Isrc/external/cpuid/src \
       -Ivst -Ivst/external/VST_SDK/VST3_SDK -Ivst/external/VST_SDK/VST3_SDK/vstgui4 -Ivst/external/ring_buffer \

src/CMakeLists.txt

@@ -214,11 +214,13 @@ source_group("Other Files" FILES ${SFIZZ_PARSER_OTHER})
 
 # Sfizz parser library
 add_library(sfizz_parser STATIC)
+add_library(sfizz::parser ALIAS sfizz_parser)
 target_sources(sfizz_parser PRIVATE
     ${SFIZZ_PARSER_HEADERS} ${SFIZZ_PARSER_SOURCES} ${SFIZZ_PARSER_OTHER})
 target_include_directories(sfizz_parser PUBLIC sfizz)
-target_include_directories(sfizz_parser PUBLIC external)
+target_link_libraries(sfizz_parser
-target_link_libraries(sfizz_parser PUBLIC absl::strings PRIVATE absl::flat_hash_map)
+    PUBLIC sfizz::filesystem absl::strings
+    PRIVATE absl::flat_hash_map)
 
 # OSC messaging library
 set(SFIZZ_MESSAGING_HEADERS
@@ -230,6 +232,7 @@ set(SFIZZ_MESSAGING_SOURCES
     sfizz/Messaging.cpp)
 
 add_library(sfizz_messaging STATIC)
+add_library(sfizz::messaging ALIAS sfizz_messaging)
 target_sources(sfizz_messaging PRIVATE
     ${SFIZZ_MESSAGING_HEADERS} ${SFIZZ_MESSAGING_SOURCES})
 target_include_directories(sfizz_messaging PUBLIC ".")
@@ -237,12 +240,13 @@ target_link_libraries(sfizz_messaging PUBLIC absl::strings)
 
 # Sfizz static library
 add_library(sfizz_static STATIC)
+add_library(sfizz::static ALIAS sfizz_static)
 target_sources(sfizz_static PRIVATE
     ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp)
 target_include_directories(sfizz_static PUBLIC .)
 target_include_directories(sfizz_static PUBLIC external)
-target_link_libraries(sfizz_static PUBLIC absl::strings absl::span)
+target_link_libraries(sfizz_static PUBLIC absl::strings absl::span sfizz::filesystem)
-target_link_libraries(sfizz_static PRIVATE sfizz_parser sfizz_messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::kissfft sfizz::cpuid sfizz::jsl sfizz::atomic)
+target_link_libraries(sfizz_static PRIVATE sfizz_parser sfizz::messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::hiir sfizz::kissfft sfizz::cpuid sfizz::jsl sfizz::atomic)
 set_target_properties(sfizz_static PROPERTIES OUTPUT_NAME sfizz PUBLIC_HEADER "sfizz.h;sfizz.hpp;sfizz_message.h")
 if(SFIZZ_USE_SNDFILE)
     target_compile_definitions(sfizz_static PUBLIC SFIZZ_USE_SNDFILE=1)
@@ -263,17 +267,17 @@ endif()
 
 configure_file(${PROJECT_SOURCE_DIR}/scripts/doxygen/Doxyfile.in ${PROJECT_SOURCE_DIR}/Doxyfile @ONLY)
 
-add_library(sfizz::parser ALIAS sfizz_parser)
 add_library(sfizz::sfizz ALIAS sfizz_static)
 
 # Shared library and installation target
 if(SFIZZ_SHARED)
     add_library(sfizz_shared SHARED)
+    add_library(sfizz::shared ALIAS sfizz_shared)
     target_sources(sfizz_shared PRIVATE
         ${SFIZZ_HEADERS} ${SFIZZ_SOURCES} ${FAUST_FILES} sfizz/sfizz_wrapper.cpp sfizz/sfizz.cpp)
     target_include_directories(sfizz_shared PRIVATE .)
     target_include_directories(sfizz_shared PRIVATE external)
-    target_link_libraries(sfizz_shared PRIVATE absl::strings absl::span sfizz_parser sfizz_messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::kissfft sfizz::cpuid sfizz::jsl sfizz::atomic)
+    target_link_libraries(sfizz_shared PRIVATE absl::strings absl::span sfizz_parser sfizz::messaging absl::flat_hash_map Threads::Threads st_audiofile sfizz::pugixml sfizz::spline sfizz::tunings sfizz::hiir sfizz::kissfft sfizz::cpuid sfizz::jsl sfizz::filesystem sfizz::atomic)
     if(SFIZZ_USE_SNDFILE)
         target_compile_definitions(sfizz_shared PUBLIC SFIZZ_USE_SNDFILE=1)
         target_link_libraries(sfizz_shared PUBLIC st_audiofile)

src/external/ghc/fs_fwd.hpp

@@ -1,46 +0,0 @@
-//---------------------------------------------------------------------------------------
-//
-// ghc::filesystem - A C++17-like filesystem implementation for C++11/C++14
-//
-//---------------------------------------------------------------------------------------
-//
-// Copyright (c) 2018, Steffen Schümann <s.schuemann@pobox.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors
-//    may be used to endorse or promote products derived from this software without
-//    specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//---------------------------------------------------------------------------------------
-// fs_fwd.hpp - The forwarding header for the header/implementation seperated usage of
-//              ghc::filesystem.
-// This file can be include at any place, where ghc::filesystem api is needed while
-// not bleeding implementation details (e.g. system includes) into the global namespace,
-// as long as one cpp includes fs_impl.hpp to deliver the matching implementations.
-//---------------------------------------------------------------------------------------
-#ifndef GHC_FILESYSTEM_FWD_H
-#define GHC_FILESYSTEM_FWD_H
-#define GHC_FILESYSTEM_FWD
-#include <ghc/filesystem.hpp>
-#endif // GHC_FILESYSTEM_FWD_H

src/external/ghc/fs_impl.hpp

@@ -1,43 +0,0 @@
-//---------------------------------------------------------------------------------------
-//
-// ghc::filesystem - A C++17-like filesystem implementation for C++11/C++14
-//
-//---------------------------------------------------------------------------------------
-//
-// Copyright (c) 2018, Steffen Schümann <s.schuemann@pobox.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors
-//    may be used to endorse or promote products derived from this software without
-//    specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//---------------------------------------------------------------------------------------
-// fs_impl.hpp - The implementation header for the header/implementation seperated usage of
-//               ghc::filesystem.
-// This file can be used to hide the implementation of ghc::filesystem into a single cpp.
-// The cpp has to include this before including fs_fwd.hpp directly or via a different
-// header to work.
-//---------------------------------------------------------------------------------------
-#define GHC_FILESYSTEM_IMPLEMENTATION
-#include <ghc/filesystem.hpp>

src/external/ghc/fs_std.hpp

@@ -1,64 +0,0 @@
-//---------------------------------------------------------------------------------------
-//
-// ghc::filesystem - A C++17-like filesystem implementation for C++11/C++14
-//
-//---------------------------------------------------------------------------------------
-//
-// Copyright (c) 2018, Steffen Schümann <s.schuemann@pobox.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors
-//    may be used to endorse or promote products derived from this software without
-//    specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//---------------------------------------------------------------------------------------
-// fs_std.hpp - The dynamic switching header that includes std::filesystem if detected
-//              or ghc::filesystem if not, and makes the resulting API available in the
-//              namespace fs.
-//---------------------------------------------------------------------------------------
-#ifndef GHC_FILESYSTEM_STD_H
-#if defined(__cplusplus) && __cplusplus >= 201703L && defined(__has_include)
-#if __has_include(<filesystem>)
-#define GHC_USE_STD_FS
-#include <filesystem>
-namespace fs {
-using namespace std::filesystem;
-using ifstream = std::ifstream;
-using ofstream = std::ofstream;
-using fstream = std::fstream;
-}
-#endif
-#endif
-#ifndef GHC_USE_STD_FS
-#define GHC_WIN_WSTRING_STRING_TYPE
-#include <ghc/filesystem.hpp>
-namespace fs {
-using namespace ghc::filesystem;
-using ifstream = ghc::filesystem::ifstream;
-using ofstream = ghc::filesystem::ofstream;
-using fstream = ghc::filesystem::fstream;
-} 
-#endif
-#endif // GHC_FILESYSTEM_STD_H
-

src/external/ghc/fs_std_fwd.hpp

@@ -1,68 +0,0 @@
-//---------------------------------------------------------------------------------------
-//
-// ghc::filesystem - A C++17-like filesystem implementation for C++11/C++14
-//
-//---------------------------------------------------------------------------------------
-//
-// Copyright (c) 2018, Steffen Schümann <s.schuemann@pobox.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors
-//    may be used to endorse or promote products derived from this software without
-//    specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//---------------------------------------------------------------------------------------
-// fs_std_fwd.hpp - The forwarding header for the header/implementation seperated usage of
-//                  ghc::filesystem that uses std::filesystem if it detects it.
-// This file can be include at any place, where fs::filesystem api is needed while
-// not bleeding implementation details (e.g. system includes) into the global namespace,
-// as long as one cpp includes fs_std_impl.hpp to deliver the matching implementations.
-//---------------------------------------------------------------------------------------
-#ifndef GHC_FILESYSTEM_STD_FWD_H
-#define GHC_FILESYSTEM_STD_FWD_H
-#if defined(__cplusplus) && __cplusplus >= 201703L && defined(__has_include)
-#if __has_include(<filesystem>)
-#define GHC_USE_STD_FS
-#include <filesystem>
-namespace fs {
-using namespace std::filesystem;
-using ifstream = std::ifstream;
-using ofstream = std::ofstream;
-using fstream = std::fstream;
-}
-#endif
-#endif
-#ifndef GHC_USE_STD_FS
-#define GHC_WIN_WSTRING_STRING_TYPE
-#define GHC_FILESYSTEM_FWD
-#include <ghc/filesystem.hpp>
-namespace fs {
-using namespace ghc::filesystem;
-using ifstream = ghc::filesystem::ifstream;
-using ofstream = ghc::filesystem::ofstream;
-using fstream = ghc::filesystem::fstream;
-} 
-#endif
-#endif // GHC_FILESYSTEM_STD_FWD_H
-

src/external/ghc/fs_std_impl.hpp

@@ -1,51 +0,0 @@
-//---------------------------------------------------------------------------------------
-//
-// ghc::filesystem - A C++17-like filesystem implementation for C++11/C++14
-//
-//---------------------------------------------------------------------------------------
-//
-// Copyright (c) 2018, Steffen Schümann <s.schuemann@pobox.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this
-//    list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation
-//    and/or other materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors
-//    may be used to endorse or promote products derived from this software without
-//    specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//---------------------------------------------------------------------------------------
-// fs_std_impl.hpp - The implementation header for the header/implementation seperated usage of
-//                   ghc::filesystem that does nothing if std::filesystem is detected.
-// This file can be used to hide the implementation of ghc::filesystem into a single cpp.
-// The cpp has to include this before including fs_std_fwd.hpp directly or via a different
-// header to work.
-//---------------------------------------------------------------------------------------
-#if defined(__cplusplus) && __cplusplus >= 201703L && defined(__has_include)
-#if __has_include(<filesystem>)
-#define GHC_USE_STD_FS
-#endif
-#endif
-#ifndef GHC_USE_STD_FS
-#define GHC_WIN_WSTRING_STRING_TYPE
-#define GHC_FILESYSTEM_IMPLEMENTATION
-#include <ghc/filesystem.hpp>
-#endif

src/external/hiir/license.txt

@@ -0,0 +1,13 @@
+        DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+                    Version 2, December 2004 
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net> 
+
+ Everyone is permitted to copy and distribute verbatim or modified 
+ copies of this license document, and changing it is allowed as long 
+ as the name is changed. 
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE 
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+
+  0. You just DO WHAT THE FUCK YOU WANT TO.

vst/CMakeLists.txt

@@ -59,8 +59,8 @@ if(WIN32)
 endif()
 target_link_libraries(${VSTPLUGIN_PRJ_NAME}
     PRIVATE ${PROJECT_NAME}::${PROJECT_NAME}
-    PRIVATE sfizz_editor
+    PRIVATE sfizz::editor
-    PRIVATE sfizz::pugixml)
+    PRIVATE sfizz::pugixml sfizz::filesystem)
 target_include_directories(${VSTPLUGIN_PRJ_NAME}
     PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
 set_target_properties(${VSTPLUGIN_PRJ_NAME} PROPERTIES
@@ -197,8 +197,8 @@ elseif(SFIZZ_AU)
 
     target_link_libraries(${AUPLUGIN_PRJ_NAME}
         PRIVATE ${PROJECT_NAME}::${PROJECT_NAME}
-        PRIVATE sfizz_editor
+        PRIVATE sfizz::editor
-        PRIVATE sfizz::pugixml)
+        PRIVATE sfizz::pugixml sfizz::filesystem)
     target_include_directories(${AUPLUGIN_PRJ_NAME}
         PRIVATE "${CMAKE_CURRENT_BINARY_DIR}")
     set_target_properties(${AUPLUGIN_PRJ_NAME} PROPERTIES