ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6498 from lioncash/cmake 

AudioCommon/CMakelists: Migrate off add_dolphin_library
This commit is contained in:
Pierre Bourdon 2018-03-23 12:07:00 +01:00 committed by GitHub
parent 733186d48b b96bbc8f8d
commit 27ffc8a69d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/AudioCommon/CMakeLists.txt
View File

@ -1,16 +1,14 @@
set(SRCS add_library(audiocommon
AudioCommon.cpp AudioCommon.cpp
AudioStretcher.cpp AudioStretcher.cpp
CubebStream.cpp CubebStream.cpp
CubebUtils.cpp CubebUtils.cpp
DPL2Decoder.cpp DPL2Decoder.cpp
Mixer.cpp Mixer.cpp
WaveFile.cpp
NullSoundStream.cpp NullSoundStream.cpp
WaveFile.cpp
) )
add_dolphin_library(audiocommon "${SRCS}" "")
find_package(OpenSLES) find_package(OpenSLES)
if(OPENSLES_FOUND) if(OPENSLES_FOUND)
message(STATUS "OpenSLES found, enabling OpenSLES sound backend") message(STATUS "OpenSLES found, enabling OpenSLES sound backend")
@ -51,7 +49,7 @@ endif()
if(WIN32) if(WIN32)
target_sources(audiocommon PRIVATE XAudio2Stream.cpp) target_sources(audiocommon PRIVATE XAudio2Stream.cpp)
add_dolphin_library(audiocommon_xaudio27 "XAudio2_7Stream.cpp" "${LIBS}") add_library(audiocommon_xaudio27 "XAudio2_7Stream.cpp")
target_include_directories(audiocommon_xaudio27 PRIVATE target_include_directories(audiocommon_xaudio27 PRIVATE
${PROJECT_SOURCE_DIR}/Externals ${PROJECT_SOURCE_DIR}/Externals
${PROJECT_SOURCE_DIR}/Externals/XAudio2_7 ${PROJECT_SOURCE_DIR}/Externals/XAudio2_7