diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-10-05 06:56:20 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-10-05 06:56:20 +0300 |
| commit | ddfd6b518c15517f40053a7ade5ceb440de966f3 (patch) | |
| tree | 67bf08bb57578ad84942caf7a60fd193ac50c8ba /build_files | |
| parent | 1b38effd5f270de0ef6b81fe78af4c63ed256e05 (diff) | |
| parent | 6e08b01bd9ab87f63d8176bf2ec0b4f073a92ee3 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/ffmpeg.cmake | 1 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/sdl.cmake | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake index 5c8347cd40e..2a8e3fd5d33 100644 --- a/build_files/build_environment/cmake/ffmpeg.cmake +++ b/build_files/build_environment/cmake/ffmpeg.cmake @@ -112,6 +112,7 @@ ExternalProject_Add(external_ffmpeg --disable-indev=alsa --disable-outdev=alsa --disable-crystalhd + --disable-sndio BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS} INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS} diff --git a/build_files/build_environment/cmake/sdl.cmake b/build_files/build_environment/cmake/sdl.cmake index 8383c5a5a79..ab81ad130e8 100644 --- a/build_files/build_environment/cmake/sdl.cmake +++ b/build_files/build_environment/cmake/sdl.cmake @@ -25,6 +25,7 @@ else() -DSDL_STATIC=ON -DSDL_SHARED=OFF -DSDL_VIDEO=OFF + -DSNDIO=OFF ) endif() |