diff options
Diffstat (limited to '')
| -rwxr-xr-x | .ci/scripts/linux/docker.sh | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 2 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 d98ba7767..92c9929cf 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 | ||
| @@ -604,6 +604,8 @@ if (YUZU_USE_BUNDLED_FFMPEG) | |||
| 604 | --disable-vdpau | 604 | --disable-vdpau |
| 605 | --enable-decoder=h264 | 605 | --enable-decoder=h264 |
| 606 | --enable-decoder=vp9 | 606 | --enable-decoder=vp9 |
| 607 | --cc="${CMAKE_C_COMPILER}" | ||
| 608 | --cxx="${CMAKE_CXX_COMPILER}" | ||
| 607 | WORKING_DIRECTORY | 609 | WORKING_DIRECTORY |
| 608 | ${FFmpeg_BUILD_DIR} | 610 | ${FFmpeg_BUILD_DIR} |
| 609 | ) | 611 | ) |
diff --git a/externals/libusb/CMakeLists.txt b/externals/libusb/CMakeLists.txt index 151ddc462..12bdc097a 100644 --- a/externals/libusb/CMakeLists.txt +++ b/externals/libusb/CMakeLists.txt | |||
| @@ -67,6 +67,8 @@ if (MINGW OR (${CMAKE_SYSTEM_NAME} MATCHES "Linux") OR APPLE) | |||
| 67 | "${LIBUSB_MAKEFILE}" | 67 | "${LIBUSB_MAKEFILE}" |
| 68 | COMMAND | 68 | COMMAND |
| 69 | env | 69 | env |
| 70 | CC="${CMAKE_C_COMPILER}" | ||
| 71 | CXX="${CMAKE_CXX_COMPILER}" | ||
| 70 | CFLAGS="${LIBUSB_CFLAGS}" | 72 | CFLAGS="${LIBUSB_CFLAGS}" |
| 71 | sh "${LIBUSB_CONFIGURE}" | 73 | sh "${LIBUSB_CONFIGURE}" |
| 72 | ${LIBUSB_CONFIGURE_ARGS} | 74 | ${LIBUSB_CONFIGURE_ARGS} |