From 06013d5eec9a906f9d64df4de50a1ca2cc3adeea Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 10 Dec 2010 02:00:05 +0000 Subject: Make the cmake check_lib macro more versatile. It first tries pkg-config, and if that fails it then check for libraries and required headers. Also cleaned up the output a little bit. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6544 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/VideoCommon/CMakeLists.txt | 6 +++--- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'Source') diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 15275707dd..5013ea07da 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -39,14 +39,14 @@ set(SRCS Src/BPMemory.cpp Src/XFStructs.cpp Src/OpenCL/OCLTextureDecoder.cpp) -if(ENCODE_FRAMEDUMPS OR WIN32) +if(LIBAV_FOUND OR WIN32) set(SRCS ${SRCS} Src/AVIDump.cpp) endif() add_library(videocommon STATIC ${SRCS}) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - if(ENCODE_FRAMEDUMPS) - target_link_libraries(videocommon avcodec avformat swscale avutil) + if(LIBAV_FOUND) + target_link_libraries(videocommon ${LIBAV_LIBRARIES}) add_definitions(-D__STDC_CONSTANT_MACROS) endif() add_definitions(-fPIC) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index ff5722d7db..06f03848c7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -63,7 +63,7 @@ #ifdef _WIN32 #include "OS/Win32.h" #endif -#if defined _WIN32 || defined HAVE_AVCODEC +#if defined _WIN32 || defined HAVE_LIBAV #include "AVIDump.h" #endif @@ -83,7 +83,7 @@ CGprofile g_cgfProf; RasterFont* s_pfont = NULL; -#if defined _WIN32 || defined HAVE_AVCODEC +#if defined _WIN32 || defined HAVE_LIBAV static bool s_bAVIDumping = false; #else static FILE* f_pFrameDump; @@ -492,7 +492,7 @@ Renderer::~Renderer() delete g_framebuffer_manager; -#if defined _WIN32 || defined HAVE_AVCODEC +#if defined _WIN32 || defined HAVE_LIBAV if(s_bAVIDumping) AVIDump::Stop(); #else @@ -1102,7 +1102,7 @@ void Renderer::Swap(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight,cons } // Frame dumps are handled a little differently in Windows -#if defined _WIN32 || defined HAVE_AVCODEC +#if defined _WIN32 || defined HAVE_LIBAV if (g_ActiveConfig.bDumpFrames) { s_criticalScreenshot.Enter(); -- cgit v1.2.3