diff options
| author | 2016-04-28 09:45:15 -0400 | |
|---|---|---|
| committer | 2016-04-28 09:45:15 -0400 | |
| commit | 2f76dc6758787289c45ebb4f66a869a0fc1b6bd5 (patch) | |
| tree | 704d358a9779e6b2e935aaaec3e7fc84e9ee315d | |
| parent | Merge pull request #1708 from MerryMage/dsp_dsp (diff) | |
| parent | Externals: Add soundtouch (diff) | |
| download | yuzu-2f76dc6758787289c45ebb4f66a869a0fc1b6bd5.tar.gz yuzu-2f76dc6758787289c45ebb4f66a869a0fc1b6bd5.tar.xz yuzu-2f76dc6758787289c45ebb4f66a869a0fc1b6bd5.zip | |
Merge pull request #1722 from MerryMage/soundtouch
Externals: Add soundtouch
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| m--------- | externals/soundtouch | 0 | ||||
| -rw-r--r-- | src/audio_core/CMakeLists.txt | 5 |
4 files changed, 10 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 598e4c64d..059512902 100644 --- a/.gitmodules +++ b/.gitmodules | |||
| @@ -7,3 +7,6 @@ | |||
| 7 | [submodule "nihstro"] | 7 | [submodule "nihstro"] |
| 8 | path = externals/nihstro | 8 | path = externals/nihstro |
| 9 | url = https://github.com/neobrain/nihstro.git | 9 | url = https://github.com/neobrain/nihstro.git |
| 10 | [submodule "soundtouch"] | ||
| 11 | path = externals/soundtouch | ||
| 12 | url = https://github.com/citra-emu/soundtouch.git | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt index 019321ad8..d628ecc50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -249,6 +249,9 @@ if(ENABLE_QT) | |||
| 249 | include_directories(externals/qhexedit) | 249 | include_directories(externals/qhexedit) |
| 250 | add_subdirectory(externals/qhexedit) | 250 | add_subdirectory(externals/qhexedit) |
| 251 | endif() | 251 | endif() |
| 252 | |||
| 253 | add_subdirectory(externals/soundtouch) | ||
| 254 | |||
| 252 | add_subdirectory(src) | 255 | add_subdirectory(src) |
| 253 | 256 | ||
| 254 | # Install freedesktop.org metadata files, following those specifications: | 257 | # Install freedesktop.org metadata files, following those specifications: |
diff --git a/externals/soundtouch b/externals/soundtouch new file mode 160000 | |||
| Subproject 5274ec4dec498bd88ccbcd28862a0f78a3b95ef | |||
diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 869da5e83..c08ce69e0 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt | |||
| @@ -16,6 +16,9 @@ set(HEADERS | |||
| 16 | sink.h | 16 | sink.h |
| 17 | ) | 17 | ) |
| 18 | 18 | ||
| 19 | include_directories(../../externals/soundtouch/include) | ||
| 20 | |||
| 19 | create_directory_groups(${SRCS} ${HEADERS}) | 21 | create_directory_groups(${SRCS} ${HEADERS}) |
| 20 | 22 | ||
| 21 | add_library(audio_core STATIC ${SRCS} ${HEADERS}) \ No newline at end of file | 23 | add_library(audio_core STATIC ${SRCS} ${HEADERS}) |
| 24 | target_link_libraries(audio_core SoundTouch) | ||