forked from bartvdbraak/blender
Make deps: Compile own nasm for Linux
This solves annoyance that the official RPM repository of nasm requires newer version of rpm tool compared to what is shipped by default with centOS 7. Differential Revision: https://developer.blender.org/D8905
This commit is contained in:
parent
d377b1fe76
commit
157cd6c6e8
@ -34,7 +34,7 @@
|
|||||||
# Run "make deps" from main Blender directory
|
# Run "make deps" from main Blender directory
|
||||||
#
|
#
|
||||||
# LINUX USAGE:
|
# LINUX USAGE:
|
||||||
# Install compiler cmake autoconf automake libtool yasm nasm tcl
|
# Install compiler cmake autoconf automake libtool yasm tcl
|
||||||
# Run "make deps" from main Blender directory
|
# Run "make deps" from main Blender directory
|
||||||
#
|
#
|
||||||
####################################################################################################
|
####################################################################################################
|
||||||
@ -75,6 +75,8 @@ include(cmake/llvm.cmake)
|
|||||||
include(cmake/clang.cmake)
|
include(cmake/clang.cmake)
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
include(cmake/openmp.cmake)
|
include(cmake/openmp.cmake)
|
||||||
|
endif()
|
||||||
|
if(UNIX)
|
||||||
include(cmake/nasm.cmake)
|
include(cmake/nasm.cmake)
|
||||||
endif()
|
endif()
|
||||||
include(cmake/openimageio.cmake)
|
include(cmake/openimageio.cmake)
|
||||||
|
@ -54,7 +54,7 @@ if(UNIX)
|
|||||||
" ${_software_missing}\n"
|
" ${_software_missing}\n"
|
||||||
"\n"
|
"\n"
|
||||||
"On Debian and Ubuntu:\n"
|
"On Debian and Ubuntu:\n"
|
||||||
" apt install autoconf automake libtool yasm nasm tcl\n"
|
" apt install autoconf automake libtool yasm tcl\n"
|
||||||
"\n"
|
"\n"
|
||||||
"On macOS (with homebrew):\n"
|
"On macOS (with homebrew):\n"
|
||||||
" brew install autoconf automake bison libtool pkg-config yasm\n"
|
" brew install autoconf automake bison libtool pkg-config yasm\n"
|
||||||
|
@ -52,6 +52,11 @@ if(APPLE)
|
|||||||
--target-os=darwin
|
--target-os=darwin
|
||||||
--x86asmexe=${LIBDIR}/nasm/bin/nasm
|
--x86asmexe=${LIBDIR}/nasm/bin/nasm
|
||||||
)
|
)
|
||||||
|
elseif(UNIX)
|
||||||
|
set(FFMPEG_EXTRA_FLAGS
|
||||||
|
${FFMPEG_EXTRA_FLAGS}
|
||||||
|
--x86asmexe=${LIBDIR}/nasm/bin/nasm
|
||||||
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
ExternalProject_Add(external_ffmpeg
|
ExternalProject_Add(external_ffmpeg
|
||||||
@ -142,7 +147,7 @@ if(WIN32)
|
|||||||
external_zlib_mingw
|
external_zlib_mingw
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
if(APPLE)
|
if(UNIX)
|
||||||
add_dependencies(
|
add_dependencies(
|
||||||
external_ffmpeg
|
external_ffmpeg
|
||||||
external_nasm
|
external_nasm
|
||||||
|
@ -34,6 +34,12 @@ else()
|
|||||||
set(X264_CONFIGURE_ENV echo .)
|
set(X264_CONFIGURE_ENV echo .)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(UNIX AND NOT APPLE)
|
||||||
|
set(X264_CONFIGURE_ENV
|
||||||
|
export AS=${LIBDIR}/nasm/bin/nasm
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
ExternalProject_Add(external_x264
|
ExternalProject_Add(external_x264
|
||||||
URL ${X264_URI}
|
URL ${X264_URI}
|
||||||
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
DOWNLOAD_DIR ${DOWNLOAD_DIR}
|
||||||
@ -54,7 +60,7 @@ if(MSVC)
|
|||||||
set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
|
set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
if(UNIX)
|
||||||
add_dependencies(
|
add_dependencies(
|
||||||
external_x264
|
external_x264
|
||||||
external_nasm
|
external_nasm
|
||||||
|
Loading…
Reference in New Issue
Block a user