diff options
| author | 2021-02-08 21:13:10 -0500 | |
|---|---|---|
| committer | 2021-02-08 21:13:10 -0500 | |
| commit | 26669d9e134d2f5ce0ff75b23af5719b6521c68b (patch) | |
| tree | 94fd14bc2646bb1215006483999970cb04d2a7e3 /src | |
| parent | Merge pull request #5892 from german77/backup (diff) | |
| parent | ffmpeg: Checkout tag n4.3.1 (diff) | |
| download | yuzu-26669d9e134d2f5ce0ff75b23af5719b6521c68b.tar.gz yuzu-26669d9e134d2f5ce0ff75b23af5719b6521c68b.tar.xz yuzu-26669d9e134d2f5ce0ff75b23af5719b6521c68b.zip | |
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 2cf95937e..dd4c29ed3 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt | |||
| @@ -271,14 +271,13 @@ create_target_directory_groups(video_core) | |||
| 271 | target_link_libraries(video_core PUBLIC common core) | 271 | target_link_libraries(video_core PUBLIC common core) |
| 272 | target_link_libraries(video_core PRIVATE glad xbyak) | 272 | target_link_libraries(video_core PRIVATE glad xbyak) |
| 273 | 273 | ||
| 274 | if (MSVC) | 274 | if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32) |
| 275 | target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) | 275 | add_dependencies(video_core ffmpeg-build) |
| 276 | target_link_libraries(video_core PUBLIC ${FFMPEG_LIBRARY_DIR}/swscale.lib ${FFMPEG_LIBRARY_DIR}/avcodec.lib ${FFMPEG_LIBRARY_DIR}/avutil.lib) | ||
| 277 | else() | ||
| 278 | target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) | ||
| 279 | target_link_libraries(video_core PRIVATE ${FFMPEG_LIBRARIES}) | ||
| 280 | endif() | 276 | endif() |
| 281 | 277 | ||
| 278 | target_include_directories(video_core PRIVATE ${FFmpeg_INCLUDE_DIR}) | ||
| 279 | target_link_libraries(video_core PRIVATE ${FFmpeg_LIBRARIES}) | ||
| 280 | |||
| 282 | add_dependencies(video_core host_shaders) | 281 | add_dependencies(video_core host_shaders) |
| 283 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) | 282 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) |
| 284 | target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include) | 283 | target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include) |