From 0539ff0e1b2f4e388bf4de16d00846ed5cebe811 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sat, 12 Nov 2016 01:37:57 +0100 Subject: configure: use check_lib2 for cuda and cuvid Fixes building for Windows x86 with MSVC using the link libraries distributed with the CUDA SDK. check_lib2 is required here because it includes the header to get the full signature of the function, including the stdcall calling convention and all of its arguments, which enables the linker to determine the fully qualified object name and resolve it through the import library, since the CUDA SDK libraries do not include un-qualified aliases. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure') diff --git a/configure b/configure index be7e925..c00c591 100755 --- a/configure +++ b/configure @@ -5659,10 +5659,10 @@ fi enabled avfoundation_indev && { check_header_objcc AVFoundation/AVFoundation.h || disable avfoundation_indev; } enabled avfoundation_indev && { check_lib2 CoreGraphics/CoreGraphics.h CGGetActiveDisplayList -framework CoreGraphics || check_lib2 ApplicationServices/ApplicationServices.h CGGetActiveDisplayList -framework ApplicationServices; } -enabled cuda && { check_lib cuda.h cuInit -lcuda || +enabled cuda && { check_lib2 cuda.h cuInit -lcuda || die "ERROR: CUDA not found"; } enabled cuvid && { add_cflags -I$source_path; - check_lib "compat/cuda/cuviddec.h" cuvidCreateDecoder -lnvcuvid || + check_lib2 "compat/cuda/cuviddec.h" cuvidCreateDecoder -lnvcuvid || die "ERROR: CUVID not found"; } && { enabled cuda || die "ERROR: CUVID requires CUDA"; } -- cgit v1.1