From d16dce6d991547e92bf1ac664e36a94eaeb9195a Mon Sep 17 00:00:00 2001
From: Steveice10 <1269164+Steveice10@users.noreply.github.com>
Date: Tue, 25 Apr 2023 15:25:02 -0700
Subject: [PATCH] externals: Update SoundTouch to upstream. (#6451)

---
 .gitmodules                   | 2 +-
 externals/CMakeLists.txt      | 6 ++++--
 externals/soundtouch          | 2 +-
 src/audio_core/CMakeLists.txt | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f87afc87d..dcd856463 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,7 +6,7 @@
     url = https://github.com/neobrain/nihstro.git
 [submodule "soundtouch"]
     path = externals/soundtouch
-    url = https://github.com/citra-emu/ext-soundtouch.git
+    url = https://codeberg.org/soundtouch/soundtouch.git
 [submodule "catch2"]
     path = externals/catch2
     url = https://github.com/catchorg/Catch2
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index a0fcd9a46..a8401e7b2 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -104,9 +104,11 @@ target_include_directories(nihstro-headers INTERFACE ./nihstro/include)
 add_subdirectory(open_source_archives)
 
 # SoundTouch
+
+set(INTEGER_SAMPLES ON CACHE BOOL "")
+set(SOUNDSTRETCH OFF CACHE BOOL "")
+set(SOUNDTOUCH_DLL OFF CACHE BOOL "")
 add_subdirectory(soundtouch)
-# The SoundTouch target doesn't export the necessary include paths as properties by default
-target_include_directories(SoundTouch INTERFACE ./soundtouch/include)
 
 # Teakra
 add_subdirectory(teakra EXCLUDE_FROM_ALL)
diff --git a/externals/soundtouch b/externals/soundtouch
index 060181eaf..872639439 160000
--- a/externals/soundtouch
+++ b/externals/soundtouch
@@ -1 +1 @@
-Subproject commit 060181eaf273180d3a7e87349895bd0cb6ccbf4a
+Subproject commit 87263943999d98c1fefb2bc11d1589126af78e39
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt
index d8ebd37f0..2599f82ad 100644
--- a/src/audio_core/CMakeLists.txt
+++ b/src/audio_core/CMakeLists.txt
@@ -39,6 +39,7 @@ create_target_directory_groups(audio_core)
 target_link_libraries(audio_core PUBLIC common)
 target_link_libraries(audio_core PRIVATE SoundTouch teakra)
 set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
+add_definitions(-DSOUNDTOUCH_INTEGER_SAMPLES)
 
 if(ENABLE_MF)
     target_sources(audio_core PRIVATE