diff options
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) | |||
| 273 | target_link_libraries(video_core PUBLIC common core) | 273 | target_link_libraries(video_core PUBLIC common core) |
| 274 | target_link_libraries(video_core PRIVATE glad xbyak) | 274 | target_link_libraries(video_core PRIVATE glad xbyak) |
| 275 | 275 | ||
| 276 | if (MSVC) | 276 | if (YUZU_USE_BUNDLED_FFMPEG AND NOT WIN32) |
| 277 | target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) | 277 | add_dependencies(video_core ffmpeg-build) |
| 278 | target_link_libraries(video_core PUBLIC ${FFMPEG_LIBRARY_DIR}/swscale.lib ${FFMPEG_LIBRARY_DIR}/avcodec.lib ${FFMPEG_LIBRARY_DIR}/avutil.lib) | ||
| 279 | else() | ||
| 280 | target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) | ||
| 281 | target_link_libraries(video_core PRIVATE ${FFMPEG_LIBRARIES}) | ||
| 282 | endif() | 278 | endif() |
| 283 | 279 | ||
| 280 | target_include_directories(video_core PRIVATE ${FFMPEG_INCLUDE_DIR}) | ||
| 281 | target_link_libraries(video_core PRIVATE ${FFMPEG_LIBRARIES}) | ||
| 282 | |||
| 284 | add_dependencies(video_core host_shaders) | 283 | add_dependencies(video_core host_shaders) |
| 285 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) | 284 | target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) |
| 286 | target_include_directories(video_core PRIVATE sirit ../../externals/Vulkan-Headers/include) | 285 | 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 @@ | |||
| 13 | #include "video_core/memory_manager.h" | 13 | #include "video_core/memory_manager.h" |
| 14 | 14 | ||
| 15 | extern "C" { | 15 | extern "C" { |
| 16 | #include <libavutil/opt.h> | 16 | #include "libavutil/opt.h" |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | namespace Tegra { | 19 | namespace Tegra { |