From 19e75fd8838df668fb4b9af95b3a57874b1af32a Mon Sep 17 00:00:00 2001 From: Timo Rothenpieler Date: Sun, 28 Aug 2016 17:54:29 +0200 Subject: avcodec/nvenc: fix library names on cygwin --- libavcodec/nvenc.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index d1c7d934a7..c92df532b6 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -21,24 +21,26 @@ #include "config.h" -#if defined(_WIN32) -#include - -#define CUDA_LIBNAME TEXT("nvcuda.dll") -#if ARCH_X86_64 -#define NVENC_LIBNAME TEXT("nvEncodeAPI64.dll") +#if defined(_WIN32) || defined(__CYGWIN__) +# define CUDA_LIBNAME "nvcuda.dll" +# if ARCH_X86_64 +# define NVENC_LIBNAME "nvEncodeAPI64.dll" +# else +# define NVENC_LIBNAME "nvEncodeAPI.dll" +# endif #else -#define NVENC_LIBNAME TEXT("nvEncodeAPI.dll") +# define CUDA_LIBNAME "libcuda.so" +# define NVENC_LIBNAME "libnvidia-encode.so" #endif -#define dlopen(filename, flags) LoadLibrary((filename)) +#if defined(_WIN32) +#include + +#define dlopen(filename, flags) LoadLibrary(TEXT(filename)) #define dlsym(handle, symbol) GetProcAddress(handle, symbol) #define dlclose(handle) FreeLibrary(handle) #else #include - -#define CUDA_LIBNAME "libcuda.so" -#define NVENC_LIBNAME "libnvidia-encode.so" #endif #include "libavutil/hwcontext.h" -- cgit v1.2.3