From b90504a0dc4d835750ebe7e9272e3f0135a602b0 Mon Sep 17 00:00:00 2001 From: Sacha Date: Sat, 22 Jun 2013 01:13:19 +1000 Subject: [PATCH] CMake ffmpeg: Use correct include dir (which does vary for each platform). --- CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d46c7a9981..75487bc557 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,8 @@ endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(LINUX ON) if (NOT USING_GLES2) - set(FFMPEG ON) + # Not working yet. + #set(FFMPEG ON) endif() endif() @@ -497,19 +498,21 @@ endif() if(FFMPEG) add_definitions(-DUSE_FFMPEG) - include_directories(ffmpeg) + set(PLATFORM_ARCH "") if (BLACKBERRY) - link_directories(ffmpeg/blackberry/armv7/lib) + set(PLATFORM_ARCH "blackberry/armv7") set(nativeExtraLibs ${nativeExtraLibs} iconv) elseif(IOS) - link_directories(ffmpeg/ios/universal/lib) + set(PLATFORM_ARCH "ios/universal") set(nativeExtraLibs ${nativeExtraLibs} iconv bz2) elseif(MACOSX) - link_directories(ffmpeg/macosx/x86_64/lib) + set(PLATFORM_ARCH "macosx/x86_64") elseif(LINUX) # Note: Only 64-bit is supported - link_directories(ffmpeg/linux/x86_64/lib) + set(PLATFORM_ARCH "linux/x86_64") endif() + include_directories(ffmpeg/${PLATFORM_ARCH}/include) + link_directories(ffmpeg/${PLATFORM_ARCH}/lib) set(nativeExtraLibs ${nativeExtraLibs} libavformat.a libavcodec.a libswresample.a libavutil.a libswscale.a) endif()