From 3f765ea9a4598a5b68e8210aec75067f901172b9 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Wed, 15 Dec 2021 01:10:07 -0700 Subject: video_core/codecs: (re-spin) refactor ffmpeg searching and handling --- externals/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 64d1e6aec..bbbe6667d 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -121,3 +121,8 @@ if (NOT opus_FOUND) message(STATUS "opus 1.3 or newer not found, falling back to externals") add_subdirectory(opus EXCLUDE_FROM_ALL) endif() + +# FFMpeg +if (YUZU_USE_BUNDLED_FFMPEG) + add_subdirectory(ffmpeg) +endif() -- cgit v1.2.3 From 3ae9258efe9b246b5a391aa4f0c822a7867e0843 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Wed, 15 Dec 2021 00:27:12 -0700 Subject: externals: fix a regression when using MSVC --- externals/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index bbbe6667d..6457387b4 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -125,4 +125,5 @@ endif() # FFMpeg if (YUZU_USE_BUNDLED_FFMPEG) add_subdirectory(ffmpeg) + set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE) endif() -- cgit v1.2.3 From 476637d1435f031017abb06a42902b925dc08151 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Wed, 15 Dec 2021 00:53:22 -0700 Subject: externals/ffmpeg: set the cmake variable twice ... ... to avoid leaving variable undefined in the current scope --- externals/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'externals/CMakeLists.txt') diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 6457387b4..edfa3a2be 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -126,4 +126,7 @@ endif() if (YUZU_USE_BUNDLED_FFMPEG) add_subdirectory(ffmpeg) set(FFmpeg_PATH "${FFmpeg_PATH}" PARENT_SCOPE) + set(FFmpeg_LDFLAGS "${FFmpeg_LDFLAGS}" PARENT_SCOPE) + set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" PARENT_SCOPE) + set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE) endif() -- cgit v1.2.3