diff options
| author | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-07-06 18:54:24 +0200 |
|---|---|---|
| committer | lat9nq <22451773+lat9nq@users.noreply.github.com> | 2021-07-06 18:54:24 +0200 |
| commit | ef70054367c1162df2634b9f462011c15614f191 (patch) | |
| tree | 92ec36451ab29771bb4bbb6c9e50fa424cabd4d6 | |
| parent | cmake, ci: Build bundled FFmpeg with yuzu (diff) | |
| download | yuzu-ef70054367c1162df2634b9f462011c15614f191.tar yuzu-ef70054367c1162df2634b9f462011c15614f191.tar.gz yuzu-ef70054367c1162df2634b9f462011c15614f191.tar.bz2 yuzu-ef70054367c1162df2634b9f462011c15614f191.tar.lz yuzu-ef70054367c1162df2634b9f462011c15614f191.tar.xz yuzu-ef70054367c1162df2634b9f462011c15614f191.tar.zst yuzu-ef70054367c1162df2634b9f462011c15614f191.zip | |
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/libusb/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38a141652..e68868797 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -605,6 +605,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} |