summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-23 08:43:14 +0100
committerGitHub <noreply@github.com>2022-01-23 08:43:14 +0100
commit2136ebccd65a27bc4aa64e5f9174abd994247641 (patch)
tree8d3817de4f00cc52f1393eca26113dc3d2078c3c
parentMerge pull request #7716 from german77/volume (diff)
parentImprove FFmpeg cmake file (diff)
downloadyuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.tar
yuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.tar.gz
yuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.tar.bz2
yuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.tar.lz
yuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.tar.xz
yuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.tar.zst
yuzu-2136ebccd65a27bc4aa64e5f9174abd994247641.zip
-rw-r--r--externals/ffmpeg/CMakeLists.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt
index c57b54f77..be8325b47 100644
--- a/externals/ffmpeg/CMakeLists.txt
+++ b/externals/ffmpeg/CMakeLists.txt
@@ -95,7 +95,8 @@ if (NOT WIN32)
# ffnvenc could load CUDA libraries at the runtime using dlopen/dlsym or LoadLibrary/GetProcAddress
# here we handle the hard-linking senario where CUDA is linked during compilation
if (CUDA_FOUND)
- list(APPEND FFmpeg_HWACCEL_FLAGS --extra-cflags=-I${CUDA_INCLUDE_DIRS})
+ # This line causes build error if CUDA_INCLUDE_DIRS is anything but a single non-empty value
+ #list(APPEND FFmpeg_HWACCEL_FLAGS --extra-cflags=-I${CUDA_INCLUDE_DIRS})
list(APPEND FFmpeg_HWACCEL_LIBRARIES ${CUDA_LIBRARIES})
list(APPEND FFmpeg_HWACCEL_INCLUDE_DIRS ${CUDA_INCLUDE_DIRS})
list(APPEND FFmpeg_HWACCEL_LDFLAGS ${CUDA_LDFLAGS})
@@ -119,6 +120,8 @@ if (NOT WIN32)
# `configure` parameters builds only exactly what yuzu needs from FFmpeg
# `--disable-vdpau` is needed to avoid linking issues
+ set(FFmpeg_CC ${CMAKE_C_COMPILER_LAUNCHER} ${CMAKE_C_COMPILER})
+ set(FFmpeg_CXX ${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER})
add_custom_command(
OUTPUT
${FFmpeg_MAKEFILE}
@@ -137,12 +140,14 @@ if (NOT WIN32)
--enable-decoder=h264
--enable-decoder=vp8
--enable-decoder=vp9
- --cc="${CMAKE_C_COMPILER}"
- --cxx="${CMAKE_CXX_COMPILER}"
+ --cc="${FFmpeg_CC}"
+ --cxx="${FFmpeg_CXX}"
${FFmpeg_HWACCEL_FLAGS}
WORKING_DIRECTORY
${FFmpeg_BUILD_DIR}
)
+ unset(FFmpeg_CC)
+ unset(FFmpeg_CXX)
unset(FFmpeg_HWACCEL_FLAGS)
# Workaround for Ubuntu 18.04's older version of make not being able to call make as a child