diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-02-05 19:45:10 +0100 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-02-05 20:49:51 +0100 |
| commit | 47401016bfbcd904edd22a4a1bf772e893ad36f6 (patch) | |
| tree | 3feea837141a662030243997c28ffd92c5e4fd17 /src | |
| parent | externals: Add submodule ffmpeg (diff) | |
| download | yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.tar yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.tar.gz yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.tar.bz2 yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.tar.lz yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.tar.xz yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.tar.zst yuzu-47401016bfbcd904edd22a4a1bf772e893ad36f6.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/video_core/command_classes/codecs/codec.cpp | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index bb1f8491f..01e284d8c 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -273,14 +273,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) diff --git a/src/video_core/command_classes/codecs/codec.cpp b/src/video_core/command_classes/codecs/codec.cpp index 39bc923a5..c25d2ad2c 100644 --- a/src/video_core/command_classes/codecs/codec.cpp +++ b/src/video_core/command_classes/codecs/codec.cpp @@ -13,7 +13,7 @@ #include "video_core/memory_manager.h" extern "C" { -#include <libavutil/opt.h> +#include "libavutil/opt.h" } namespace Tegra { |