From e868af285e9d908ec8e7d88d1097d7fe50327e4d Mon Sep 17 00:00:00 2001 From: kc5nra Date: Mon, 23 Mar 2015 21:10:04 -0500 Subject: [PATCH] deps-libff: Fix mingw using wrong pthread header When compiling under mingw it was using the w32-pthreads instead of the shared mingw pthread library. --- deps/libff/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/libff/CMakeLists.txt b/deps/libff/CMakeLists.txt index 72d52027a..b88085fa4 100644 --- a/deps/libff/CMakeLists.txt +++ b/deps/libff/CMakeLists.txt @@ -6,10 +6,10 @@ find_package(FFMpeg REQUIRED include_directories(${FFMPEG_INCLUDE_DIRS}) -if(WIN32) +if(WIN32 AND NOT MINGW) include_directories(../w32-pthreads) add_definitions(-Dinline=__inline) -endif(WIN32) +endif(WIN32 AND NOT MINGW) set(libff_HEADERS libff/ff-callbacks.h