diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-08-01 07:34:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 07:34:10 +0200 |
| commit | a086ee6a0021b0d9cb5a4a1fb609220f4114fb97 (patch) | |
| tree | 5d8e650db36e62fe64099964e6ead564855982f4 | |
| parent | Merge pull request #6788 from Morph1984/hle_api_12.1.0 (diff) | |
| parent | cmake: Specify the compiler on autotools externals (diff) | |
| download | yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.tar yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.tar.gz yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.tar.bz2 yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.tar.lz yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.tar.xz yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.tar.zst yuzu-a086ee6a0021b0d9cb5a4a1fb609220f4114fb97.zip | |
| -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 .. \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ -DENABLE_QT_TRANSLATION=ON \ -DUSE_DISCORD_PRESENCE=ON \ - -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} + -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ + -DYUZU_USE_BUNDLED_FFMPEG=ON make -j$(nproc) 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} ) 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) "${LIBUSB_MAKEFILE}" COMMAND env + CC="${CMAKE_C_COMPILER}" + CXX="${CMAKE_CXX_COMPILER}" CFLAGS="${LIBUSB_CFLAGS}" sh "${LIBUSB_CONFIGURE}" ${LIBUSB_CONFIGURE_ARGS} |