Linux fixes, CLion .gitignore tweaks, AudioProcessor module detection…

… macro fix
apohl79 · Jun 6, 2023 · 6eb8e90 · 6eb8e90
1 parent 22654e2
commit 6eb8e90
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,8 @@ compile_commands.json
 .vscode
 TestsData
 suppress-win.txt
+
+#KC
+.idea
+cmake-build-*
+audiogridder-deps
diff --git a/Common/Source/Utils.hpp b/Common/Source/Utils.hpp
@@ -644,7 +644,6 @@ inline int getLayoutNumChannels(const AudioProcessor::BusesLayout& l, bool isInp
     }
     return num;
 }
-#endif
 
 inline String getPluginType(const String& id, const PluginDescription* pdesc) {
     String type;
@@ -691,6 +690,7 @@ inline String getPluginName(const String& id, const PluginDescription* pdesc, bo
     }
     return name;
 }
+#endif
 
 struct FnThread : Thread {
     std::function<void()> fn;

diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
@@ -7,6 +7,7 @@ macro(FFMPEG_FIND varname shortname headername)
     PATHS
     ${FFMPEG_ROOT}/include
     $ENV{FFMPEG_DIR}/include
+    /usr/include/x86_64-linux-gnu
     /usr/local/include
     /usr/include/
     NO_DEFAULT_PATH
@@ -23,6 +24,7 @@ macro(FFMPEG_FIND varname shortname headername)
     PATHS
     ${FFMPEG_ROOT}/lib
     $ENV{FFMPEG_DIR}/lib
+    /usr/lib/x86_64-linux-gnu
     /usr/local/lib
     /usr/lib
     NO_DEFAULT_PATH

diff --git a/cmake/FindWebP.cmake b/cmake/FindWebP.cmake
@@ -7,6 +7,7 @@ macro(WEBP_FIND varname shortname headername)
     PATHS
     ${FFMPEG_ROOT}/include
     $ENV{FFMPEG_DIR}/include
+    /usr/include/x86_64-linux-gnu
     /usr/local/include
     /usr/include/
     NO_DEFAULT_PATH
@@ -23,6 +24,7 @@ macro(WEBP_FIND varname shortname headername)
     PATHS
     ${FFMPEG_ROOT}/lib
     $ENV{FFMPEG_DIR}/lib
+    /usr/lib/x86_64-linux-gnu
     /usr/local/lib
     /usr/lib
     NO_DEFAULT_PATH