diff options
Diffstat (limited to 'project/cmake/modules/FindFFMPEG.cmake')
| -rw-r--r-- | project/cmake/modules/FindFFMPEG.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/project/cmake/modules/FindFFMPEG.cmake b/project/cmake/modules/FindFFMPEG.cmake index 711845a..7f8e37f 100644 --- a/project/cmake/modules/FindFFMPEG.cmake +++ b/project/cmake/modules/FindFFMPEG.cmake | |||
| @@ -31,7 +31,7 @@ if(ENABLE_INTERNAL_FFMPEG) | |||
| 31 | URL ${FFMPEG_BASE_URL}/${FFMPEG_VER}.tar.gz | 31 | URL ${FFMPEG_BASE_URL}/${FFMPEG_VER}.tar.gz |
| 32 | PREFIX ${CORE_BUILD_DIR}/ffmpeg | 32 | PREFIX ${CORE_BUILD_DIR}/ffmpeg |
| 33 | CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} | 33 | CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR} |
| 34 | -DCMAKE_BUILD_TYPE=${DCMAKE_BUILD_TYPE} | 34 | -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} |
| 35 | -DFFMPEG_VER=${FFMPEG_VER} | 35 | -DFFMPEG_VER=${FFMPEG_VER} |
| 36 | -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME} | 36 | -DCORE_SYSTEM_NAME=${CORE_SYSTEM_NAME} |
| 37 | ${CROSS_ARGS} | 37 | ${CROSS_ARGS} |
| @@ -54,8 +54,7 @@ then | |||
| 54 | swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` | 54 | swresample=`PKG_CONFIG_PATH=${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/lib/pkgconfig ${PKG_CONFIG_EXECUTABLE} --libs --static libswresample` |
| 55 | gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` | 55 | gnutls=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors gnutls` |
| 56 | vorbisenc=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors vorbisenc` | 56 | vorbisenc=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors vorbisenc` |
| 57 | dcadec=`PKG_CONFIG_PATH=${DEPENDS_PATH}/lib/pkgconfig/ ${PKG_CONFIG_EXECUTABLE} --libs-only-l --static --silence-errors dcadec` | 57 | $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc |
| 58 | $@ $avcodec $avformat $avcodec $avfilter $swscale $swresample -lpostproc $gnutls $vorbisenc $dcadec | ||
| 59 | else | 58 | else |
| 60 | $@ | 59 | $@ |
| 61 | fi") | 60 | fi") |
