citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

externals: Update SoundTouch to upstream. (#6451)

This commit is contained in:
Steveice10 2023-04-25 15:25:02 -07:00 committed by GitHub
parent 227926c1fa
commit d16dce6d99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -6,7 +6,7 @@
url = https://github.com/neobrain/nihstro.git url = https://github.com/neobrain/nihstro.git
[submodule "soundtouch"] [submodule "soundtouch"]
path = externals/soundtouch path = externals/soundtouch
url = https://github.com/citra-emu/ext-soundtouch.git url = https://codeberg.org/soundtouch/soundtouch.git
[submodule "catch2"] [submodule "catch2"]
path = externals/catch2 path = externals/catch2
url = https://github.com/catchorg/Catch2 url = https://github.com/catchorg/Catch2

6
externals/CMakeLists.txt vendored
View File

@ -104,9 +104,11 @@ target_include_directories(nihstro-headers INTERFACE ./nihstro/include)
add_subdirectory(open_source_archives) add_subdirectory(open_source_archives)
# SoundTouch # SoundTouch
set(INTEGER_SAMPLES ON CACHE BOOL "")
set(SOUNDSTRETCH OFF CACHE BOOL "")
set(SOUNDTOUCH_DLL OFF CACHE BOOL "")
add_subdirectory(soundtouch) 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 # Teakra
add_subdirectory(teakra EXCLUDE_FROM_ALL) add_subdirectory(teakra EXCLUDE_FROM_ALL)

2
externals/soundtouch vendored

@ -1 +1 @@
Subproject commit 060181eaf273180d3a7e87349895bd0cb6ccbf4a Subproject commit 87263943999d98c1fefb2bc11d1589126af78e39

1
src/audio_core/CMakeLists.txt
View File

@ -39,6 +39,7 @@ create_target_directory_groups(audio_core)
target_link_libraries(audio_core PUBLIC common) target_link_libraries(audio_core PUBLIC common)
target_link_libraries(audio_core PRIVATE SoundTouch teakra) target_link_libraries(audio_core PRIVATE SoundTouch teakra)
set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
add_definitions(-DSOUNDTOUCH_INTEGER_SAMPLES)
if(ENABLE_MF) if(ENABLE_MF)
target_sources(audio_core PRIVATE target_sources(audio_core PRIVATE