Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2018-08-13 16:57:09 +0300
committerRay Molenkamp <github@lazydodo.com>2018-08-13 16:57:29 +0300
commit4fc2a43e52f121e771ce57d7437ee2bcd9309248 (patch)
tree53dd698084a429def481cf170073028feb6b2faa /build_files/build_environment/cmake/faad.cmake
parent349d67be288c18bfd45d8232e60a303e19cf11fb (diff)
build_environment: ffmpeg 4.0.2
with lame 3.100 ogg 1.3.3 vorbis 1.3.6 flac 1.3.2 vpx 1.7.0 x264 20180811 xvidcore 1.3.5 faad 2.8.8
Diffstat (limited to 'build_files/build_environment/cmake/faad.cmake')
-rw-r--r--build_files/build_environment/cmake/faad.cmake9
1 files changed, 7 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/faad.cmake b/build_files/build_environment/cmake/faad.cmake
index 3dd90971b84..df940c423a3 100644
--- a/build_files/build_environment/cmake/faad.cmake
+++ b/build_files/build_environment/cmake/faad.cmake
@@ -18,13 +18,18 @@
set(FAAD_EXTRA_ARGS)
+if (WIN32)
+ set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
+else()
+ set(FAAD_EXTRA_CONFIGURE echo .)
+endif()
+
ExternalProject_Add(external_faad
URL ${FAAD_URI}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${FAAD_HASH}
PREFIX ${BUILD_DIR}/faad
- PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/faad/src/external_faad < ${PATCH_DIR}/libfaad.diff
- CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
+ CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
INSTALL_DIR ${LIBDIR}/faad