diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-02-08 21:13:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 21:13:10 -0500 |
| commit | 26669d9e134d2f5ce0ff75b23af5719b6521c68b (patch) | |
| tree | 94fd14bc2646bb1215006483999970cb04d2a7e3 /src | |
| parent | 1b730827ddf7442aadbc2a481c439b90d70ca19e (diff) | |
| parent | 1a2e7c4dbd41171acf5e9408e7228c116f0c3b9f (diff) | |
Merge pull request #5880 from lat9nq/ffmpeg-external
cmake: FFmpeg linking rework
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index 2cf95937e6..dd4c29ed36 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -271,14 +271,13 @@ create_target_directory_groups(video_core) target_link_libraries(video_core PUBLIC common core) target_link_libraries(video_core PRIVATE glad xbyak) -if (MSVC) - target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) - target_link_libraries(video_core PUBLIC ${FFMPEG_LIBRARY_DIR}/swscale.lib ${FFMPEG_LIBRARY_DIR}/avcodec.lib ${FFMPEG_LIBRARY_DIR}/avutil.lib) -else() - target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) - target_link_libraries(video_core PRIVATE ${FFMPEG_LIBRARIES}) +if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32) + add_dependencies(video_core ffmpeg-build) endif() +target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR}) +target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES}) + add_dependencies(video_core host_shaders) target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include) |