diff options
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index 9b451d3ab..5070b92d1 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh | |||
| @@ -18,7 +18,8 @@ cmake .. \ | |||
| 18 | -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ | 18 | -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ |
| 19 | -DENABLE_QT_TRANSLATION=ON \ | 19 | -DENABLE_QT_TRANSLATION=ON \ |
| 20 | -DUSE_DISCORD_PRESENCE=ON \ | 20 | -DUSE_DISCORD_PRESENCE=ON \ |
| 21 | -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} | 21 | -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ |
| 22 | -DYUZU_USE_BUNDLED_FFMPEG=ON | ||
| 22 | 23 | ||
| 23 | make -j$(nproc) | 24 | make -j$(nproc) |
| 24 | 25 | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b1734f36..38a141652 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -25,7 +25,7 @@ option(YUZU_USE_BUNDLED_BOOST "Download bundled Boost" OFF) | |||
| 25 | 25 | ||
| 26 | option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF) | 26 | option(YUZU_USE_BUNDLED_LIBUSB "Compile bundled libusb" OFF) |
| 27 | 27 | ||
| 28 | CMAKE_DEPENDENT_OPTION(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" ON "WIN32" OFF) | 28 | option(YUZU_USE_BUNDLED_FFMPEG "Download/Build bundled FFmpeg" "${WIN32}") |
| 29 | 29 | ||
| 30 | option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) | 30 | option(YUZU_USE_QT_WEB_ENGINE "Use QtWebEngine for web applet implementation" OFF) |
| 31 | 31 | ||
| @@ -253,7 +253,9 @@ if(ENABLE_QT) | |||
| 253 | 253 | ||
| 254 | # Check for system Qt on Linux, fallback to bundled Qt | 254 | # Check for system Qt on Linux, fallback to bundled Qt |
| 255 | if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | 255 | if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
| 256 | find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets) | 256 | if (NOT YUZU_USE_BUNDLED_QT) |
| 257 | find_package(Qt5 ${QT_VERSION} COMPONENTS Widgets) | ||
| 258 | endif() | ||
| 257 | if (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT) | 259 | if (NOT Qt5_FOUND OR YUZU_USE_BUNDLED_QT) |
| 258 | # Check for dependencies, then enable bundled Qt download | 260 | # Check for dependencies, then enable bundled Qt download |
| 259 | 261 | ||