Merge pull request #1722 from MerryMage/soundtouch

Externals: Add soundtouch
2016-04-28 09:45:15 -04:00 · 2016-04-28 09:45:15 -04:00 · 2f76dc6758
parent 1ecee38468 27ce3b3f51
commit 2f76dc6758
4 changed files with 11 additions and 1 deletions
--- 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
--- 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:
--- a/externals/soundtouch
+++ b/externals/soundtouch
@ -0,0 +1 @@
+Subproject commit 5274ec4dec498bd88ccbcd28862a0f78a3b95eff
--- 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})
+add_library(audio_core STATIC ${SRCS} ${HEADERS})
+target_link_libraries(audio_core SoundTouch)
				`@ -0,0 +1 @@`
				`Subproject commit 5274ec4dec498bd88ccbcd28862a0f78a3b95eff`