From 239cde8aea6d529ceeddddb9f4007259ae0fc5a6 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 29 Apr 2020 11:30:26 +0200 Subject: [PATCH] Externals: Alter the soundtouch include directory. We must not provide the /Externals directory as global include directory. Here, this yield a crash because of external minizip header and system library mismatch. Soundtouch itself recormends to include it with and -I/usr/include/soundtouch, so this should fit better. --- CMakeLists.txt | 2 +- Source/Core/AudioCommon/AudioStretcher.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39ff1a40cc..864671c64e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -654,7 +654,7 @@ endif() # Using static soundtouch from Externals # Unable to use system soundtouch library: We require shorts, not floats. add_subdirectory(Externals/soundtouch) -include_directories(Externals) +include_directories(Externals/soundtouch) find_package(Cubeb) if(CUBEB_FOUND) diff --git a/Source/Core/AudioCommon/AudioStretcher.h b/Source/Core/AudioCommon/AudioStretcher.h index 4f62733850..d83f852b7f 100644 --- a/Source/Core/AudioCommon/AudioStretcher.h +++ b/Source/Core/AudioCommon/AudioStretcher.h @@ -6,7 +6,7 @@ #include -#include +#include namespace AudioCommon {