diff options
| -rw-r--r-- | CMakeLists.txt | 23 | ||||
| -rwxr-xr-x | contrib/build-scripts/build-ffmpeg-linux.sh | 13 |
2 files changed, 8 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f407134..397c954 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -654,6 +654,7 @@ find_package(FFMPEG) if (FFMPEG_FOUND) include_directories (${FFMPEG_INCLUDE_DIR}) list (APPEND USCXML_OPT_LIBS ${FFMPEG_LIBRARIES}) + endif() set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_ORIG}) @@ -936,28 +937,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DI configure_file(${CMAKE_CURRENT_SOURCE_DIR}/contrib/ctest/CTestCustom.ctest.in ${CMAKE_CURRENT_BINARY_DIR}/CTestCustom.ctest @ONCE) ############################################################ -# Include What You Use support -# https://code.google.com/p/chromium/wiki/IncludeWhatYouUse -############################################################ -# find_program(IWYU_BIN "iwyu" PATHS ENV PATH) -# if (IWYU_BIN) -# set(IWYU_ARGS "") -# get_property(IWYU_INCLUDES DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) -# list(REMOVE_DUPLICATES IWYU_INCLUDES) -# foreach(DIR ${IWYU_INCLUDES}) -# set(IWYU_ARGS "${IWYU_ARGS} -I${DIR}") -# endforeach() -# -# message(FATAL_ERROR ${IWYU_ARGS}) -# -# add_custom_target(iwyu ${IWYU_BIN} -# ${IWYU_ARGS} ${PROJECT_SOURCE_DIR}/src/uscxml/Factory.cpp -# COMMENT "Run include-what-you-use") -# add_dependencies(iwyu ${CMAKE_CURRENT_BINARY_DIR}/uscxml/config.h) -# # message(FATAL_ERROR "asdf") -#endif() - -############################################################ # Some concluding remarks ############################################################ diff --git a/contrib/build-scripts/build-ffmpeg-linux.sh b/contrib/build-scripts/build-ffmpeg-linux.sh index dc00a5a..cb4ec92 100755 --- a/contrib/build-scripts/build-ffmpeg-linux.sh +++ b/contrib/build-scripts/build-ffmpeg-linux.sh @@ -30,7 +30,7 @@ export PATH=${PATH}:${DEST_DIR}/bin git clone --depth 1 git://git.videolan.org/x264.git cd x264 -./configure --prefix="${DEST_DIR}" --bindir="${DEST_DIR}/bin" --enable-static --enable-pic +./configure --prefix="${DEST_DIR}" --bindir="${DEST_DIR}/bin" --enable-shared --enable-pic make make install cd .. @@ -38,7 +38,7 @@ cd .. git clone --depth 1 git://git.code.sf.net/p/opencore-amr/fdk-aac cd fdk-aac autoreconf -fiv -./configure --prefix="${DEST_DIR}" --disable-shared --with-pic +./configure --prefix="${DEST_DIR}" --enable-shared --with-pic make make install cd .. @@ -46,14 +46,14 @@ cd .. wget http://downloads.xiph.org/releases/opus/opus-1.0.3.tar.gz tar xzvf opus-1.0.3.tar.gz cd opus-1.0.3 -./configure --prefix="${DEST_DIR}" --disable-shared --with-pic +./configure --prefix="${DEST_DIR}" --enable-shared --with-pic make make install cd .. git clone --depth 1 http://git.chromium.org/webm/libvpx.git cd libvpx -./configure --prefix="${DEST_DIR}" --disable-examples --enable-pic +./configure --prefix="${DEST_DIR}" --disable-examples --enable-shared --enable-pic make make install cd .. @@ -63,8 +63,9 @@ cd ffmpeg PKG_CONFIG_PATH="${DEST_DIR}/lib/pkgconfig" export PKG_CONFIG_PATH ./configure --prefix="${DEST_DIR}" \ - --extra-cflags="-I${DEST_DIR}/include" --extra-ldflags="-L${DEST_DIR}/lib" --prefix="${DEST_DIR}" \ - --bindir="${DEST_DIR}/bin" --extra-libs="-ldl" --enable-gpl --enable-nonfree --enable-pic + --extra-cflags="-I${DEST_DIR}/include" --extra-ldflags="-L${DEST_DIR}/lib" \ + --bindir="${DEST_DIR}/bin" --extra-libs="-ldl" --enable-gpl --enable-nonfree \ + --enable-pic --disable-programs --disable-doc --enable-shared make make install cd .. |