diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-08-01 01:34:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 01:34:10 -0400 |
| commit | a086ee6a0021b0d9cb5a4a1fb609220f4114fb97 (patch) | |
| tree | 5d8e650db36e62fe64099964e6ead564855982f4 /CMakeLists.txt | |
| parent | 7cf0958b062d2cd264af1f6420d19d320574b021 (diff) | |
| parent | ef70054367c1162df2634b9f462011c15614f191 (diff) | |
Merge pull request #6565 from lat9nq/bundle-ffmpeg
cmake, ci: Build bundled FFmpeg with yuzu
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d98ba7767..92c9929cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ option(YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF) option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF) -CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ON "WIN32" OFF) +option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) @@ -604,6 +604,8 @@ if (YUZU_USE_BUNDLED_FFMPEG) --disable-vdpau --enable-decoder=h264 --enable-decoder=vp9 + --cc="${CMAKE_C_COMPILER}" + --cxx="${CMAKE_CXX_COMPILER}" WORKING_DIRECTORY ${FFmpeg_BUILD_DIR} ) |