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

Fixup: Merge conflict with dsp lle

This commit is contained in:
B3N30 2018-12-15 15:06:54 +01:00
parent c521f3b7d6
commit 45b5de7a18
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio_core/CMakeLists.txt
View File

@ -37,6 +37,15 @@ create_target_directory_groups(audio_core)
target_link_libraries(audio_core PUBLIC common core)
target_link_libraries(audio_core PRIVATE SoundTouch teakra)
if(FFMPEG_FOUND)
if(UNIX)
target_link_libraries(audio_core PRIVATE FFmpeg::avcodec)
else()
target_include_directories(audio_core PRIVATE ${FFMPEG_DIR}/include)
endif()
target_compile_definitions(audio_core PRIVATE HAVE_FFMPEG)
endif()
if(SDL2_FOUND)
target_link_libraries(audio_core PRIVATE SDL2)
target_compile_definitions(audio_core PRIVATE HAVE_SDL2)
@ -47,12 +56,3 @@ if(ENABLE_CUBEB)
add_definitions(-DHAVE_CUBEB=1)
endif()
if(FFMPEG_FOUND)
if(UNIX)
target_link_libraries(audio_core PRIVATE FFmpeg::avcodec)
else()
target_include_directories(audio_core PRIVATE ${FFMPEG_DIR}/include)
endif()
target_compile_definitions(audio_core PRIVATE HAVE_FFMPEG)
endif()

4
src/audio_core/hle/ffmpeg_dl.h
View File

@ -6,7 +6,7 @@
#ifdef _WIN32
#include <windows.h>
#endif
#endif // _WIN32
#include "common/logging/log.h"
@ -71,7 +71,7 @@ bool InitFFmpegDL() {
// Free the buffer.
LocalFree(messageBuffer);
LOG_ERROR(Audio_DSP, "Could not load avcodec-58.dll: {}", message);
LOG_ERROR(Audio_DSP, "Could not load avutil-56.dll: {}", message);
return false;
}