projects/aports·blob master · refs

58 lines · 2.1 KiB

1diff --git a/cmake/GitSubmoduleCheck.cmake b/cmake/GitSubmoduleCheck.cmake
2index 49d79b2..b73a6e9 100644
3--- a/cmake/GitSubmoduleCheck.cmake
4+++ b/cmake/GitSubmoduleCheck.cmake
5@@ -1,13 +1,6 @@
6-find_package(Git REQUIRED)
7-
8 # https://gist.github.com/scivision/bb1d47a9529e153617414e91ff5390af
9
10 function(git_submodule_check dir)
11- if(NOT EXISTS "${dir}/CMakeLists.txt")
12- execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive -- ${dir}
13- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
14- COMMAND_ERROR_IS_FATAL ANY)
15- endif()
16 # Add a Git submodule directory to CMake, assuming the Git submodule directory is a CMake project.
17 # add_subdirectory(${dir} EXCLUDE_FROM_ALL)
18 endfunction()
19diff --git a/external/st_audiofile/CMakeLists.txt b/external/st_audiofile/CMakeLists.txt
20index 0527eed..6361b71 100644
21--- a/external/st_audiofile/CMakeLists.txt
22+++ b/external/st_audiofile/CMakeLists.txt
23@@ -35,8 +35,10 @@ if(APPLE AND PROJECT_SYSTEM_PROCESSOR MATCHES "(arm.*)")
24 SET(WAVPACK_ENABLE_ASM OFF)
25 endif()
26
27-add_subdirectory("thirdparty/wavpack" EXCLUDE_FROM_ALL)
28+find_package(PkgConfig REQUIRED)
29+pkg_check_modules(WAVPACK REQUIRED wavpack)
30 target_link_libraries(st_audiofile_formats PUBLIC wavpack)
31+target_include_directories(st_audiofile_formats PUBLIC /usr/include/wavpack)
32
33 ###
34 if(NOT ST_AUDIO_FILE_USE_SNDFILE)
35diff --git a/src/sfizz/modulations/ModMatrix.cpp b/src/sfizz/modulations/ModMatrix.cpp
36index 98a92c8..2581509 100644
37--- a/src/sfizz/modulations/ModMatrix.cpp
38+++ b/src/sfizz/modulations/ModMatrix.cpp
39@@ -13,6 +13,7 @@
40 #include "SIMDHelpers.h"
41 #include "utility/Debug.h"
42 #include <absl/container/flat_hash_map.h>
43+#include "absl/strings/str_cat.h"
44 #include <absl/strings/string_view.h>
45 #include <vector>
46 #include <algorithm>
47diff --git a/src/sfizz/parser/Parser.h b/src/sfizz/parser/Parser.h
48index e83fc1a..bbfd8de 100644
49--- a/src/sfizz/parser/Parser.h
50+++ b/src/sfizz/parser/Parser.h
51@@ -10,6 +10,7 @@
52 #include <absl/types/optional.h>
53 #include <absl/container/flat_hash_map.h>
54 #include <absl/container/flat_hash_set.h>
55+#include <absl/strings/str_cat.h>
56 #include <string>
57 #include <memory>
58