diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2016-04-24 15:18:30 +0200 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-04-28 14:33:14 +0200 |
| commit | 27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31 (patch) | |
| tree | fb12f2b75d7adfc77e67ff7ef2b6608e1adf3e33 | |
| parent | Merge pull request #1710 from hrydgard/optimize-event-breakpoints (diff) | |
| download | yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.tar yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.tar.gz yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.tar.bz2 yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.tar.lz yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.tar.xz yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.tar.zst yuzu-27ce3b3f51998b7bd8f25d7cb1c9cc1321ad6f31.zip | |
| -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 @@ [submodule "nihstro"] path = externals/nihstro url = https://github.com/neobrain/nihstro.git +[submodule "soundtouch"] + path = externals/soundtouch + 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) include_directories(externals/qhexedit) add_subdirectory(externals/qhexedit) endif() + +add_subdirectory(externals/soundtouch) + add_subdirectory(src) # 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 sink.h ) +include_directories(../../externals/soundtouch/include) + create_directory_groups(${SRCS} ${HEADERS}) -add_library(audio_core STATIC ${SRCS} ${HEADERS})
\ No newline at end of file +add_library(audio_core STATIC ${SRCS} ${HEADERS}) +target_link_libraries(audio_core SoundTouch) |