diff options
Diffstat (limited to 'build_files')
-rwxr-xr-x | build_files/build_environment/install_deps.sh | 32 | ||||
-rw-r--r-- | build_files/buildbot/config/blender_linux.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindGLEW.cmake | 12 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindSndFile.cmake | 40 | ||||
-rw-r--r-- | build_files/cmake/macros.cmake | 20 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 12 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 13 |
8 files changed, 65 insertions, 68 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index c110f274db8..c1ba2a3ab25 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -25,7 +25,7 @@ ARGS=$( \ getopt \ -o s:i:t:h \ ---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\ +--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\ with-all,with-opencollada,with-jack,\ ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\ force-all,force-python,force-numpy,force-boost,\ @@ -104,11 +104,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS: --no-confirm Disable any interaction with user (suitable for automated run). - --use-cxx11 - Build all libraries in cpp11 'mode' (will be mandatory soon in blender2.8 branch). - NOTE: If your compiler is gcc-6.0 or above, you probably *want* to enable this option (since it's default - standard starting from this version). - --with-all By default, a number of optional and not-so-often needed libraries are not installed. This option will try to install them, at the cost of potential conflicts (depending on @@ -290,7 +285,7 @@ SUDO="sudo" NO_BUILD=false NO_CONFIRM=false -USE_CXX11=false +USE_CXX11=true # Mandatory in blender2.8 PYTHON_VERSION="3.6.2" PYTHON_VERSION_MIN="3.6" @@ -501,9 +496,6 @@ while true; do --no-confirm) NO_CONFIRM=true; shift; continue ;; - --use-cxx11) - USE_CXX11=true; shift; continue - ;; --with-all) WITH_ALL=true; shift; continue ;; @@ -804,7 +796,7 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" ) CXXFLAGS_BACK=$CXXFLAGS if [ "$USE_CXX11" = true ]; then - WARNING "You are trying to use c++11, this *should* go smoothely with any very recent distribution + WARNING "C++11 is now mandatory for blender2.8, this *should* go smoothly with any very recent distribution. However, if you are experiencing linking errors (also when building Blender itself), please try the following: * Re-run this script with '--build-all --force-all' options. * Ensure your gcc version is at the very least 4.8, if possible you should really rather use gcc-5.1 or above. @@ -2685,10 +2677,10 @@ install_DEB() { install_packages_DEB $_packages PRINT"" - SNDFILE_DEV="libsndfile1-dev" - check_package_DEB $SNDFILE_DEV + LIBSNDFILE_DEV="libsndfile1-dev" + check_package_DEB $LIBSNDFILE_DEV if [ $? -eq 0 ]; then - install_packages_DEB $SNDFILE_DEV + install_packages_DEB $LIBSNDFILE_DEV fi PRINT "" @@ -3283,10 +3275,10 @@ install_RPM() { fi PRINT"" - SNDFILE_DEV="libsndfile-devel" - check_package_RPM $SNDFILE_DEV + LIBSNDFILE_DEV="libsndfile-devel" + check_package_RPM $LIBSNDFILE_DEV if [ $? -eq 0 ]; then - install_packages_RPM $SNDFILE_DEV + install_packages_RPM $LIBSNDFILE_DEV fi if [ "$WITH_ALL" = true ]; then @@ -3690,10 +3682,10 @@ install_ARCH() { install_packages_ARCH $_packages PRINT"" - SNDFILE_DEV="libsndfile" - check_package_ARCH $SNDFILE_DEV + LIBSNDFILE_DEV="libsndfile" + check_package_ARCH $LIBSNDFILE_DEV if [ $? -eq 0 ]; then - install_packages_ARCH $SNDFILE_DEV + install_packages_ARCH $LIBSNDFILE_DEV fi PRINT "" diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index b41c94494d1..22e88a82ffd 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -74,7 +74,7 @@ set(SNDFILE_LIBRARY "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILI # OpenAL libraries set(OPENAL_ROOT_DIR "/opt/lib/openal" CACHE STRING "" FORCE) -set(OPENAL_INCLUDE_DIR "${OPENAL_ROOT_DIR}/include" CACHE STRING "" FORCE) +set(OPENAL_INCLUDE_DIR "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE) set(OPENAL_LIBRARY ${OPENAL_ROOT_DIR}/lib/libopenal.a ${OPENAL_ROOT_DIR}/lib/libcommon.a diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 2f098d5d9a4..3057237f3c6 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -9,7 +9,6 @@ # # also defined, # GLEW_LIBRARY, where to find the Glew library. -# GLEW_MX_LIBRARY, where to find the GlewMX library. #============================================================================= # Copyright 2014 Blender Foundation. @@ -50,16 +49,6 @@ FIND_LIBRARY(GLEW_LIBRARY lib64 lib ) - -FIND_LIBRARY(GLEW_MX_LIBRARY - NAMES - GLEWmx - HINTS - ${_glew_SEARCH_DIRS} - PATH_SUFFIXES - lib64 lib - ) - # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) @@ -73,7 +62,6 @@ ENDIF(GLEW_FOUND) MARK_AS_ADVANCED( GLEW_INCLUDE_DIR GLEW_LIBRARY - GLEW_MX_LIBRARY ) UNSET(_glew_SEARCH_DIRS) diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index 4094b05adab..c210c523c58 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -1,15 +1,15 @@ # - Find SndFile library # Find the native SndFile includes and library # This module defines -# SNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when -# SNDFILE_INCLUDE_DIR is found. -# SNDFILE_LIBRARIES, libraries to link against to use SndFile. -# SNDFILE_ROOT_DIR, The base directory to search for SndFile. +# LIBSNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when +# LIBSNDFILE_INCLUDE_DIR is found. +# LIBSNDFILE_LIBRARIES, libraries to link against to use SndFile. +# LIBSNDFILE_ROOT_DIR, The base directory to search for SndFile. # This can also be an environment variable. -# SNDFILE_FOUND, If false, do not try to use SndFile. +# LIBSNDFILE_FOUND, If false, do not try to use SndFile. # # also defined, but not for general use are -# SNDFILE_LIBRARY, where to find the SndFile library. +# LIBSNDFILE_LIBRARY, where to find the SndFile library. #============================================================================= # Copyright 2011 Blender Foundation. @@ -22,26 +22,26 @@ # See the License for more information. #============================================================================= -# If SNDFILE_ROOT_DIR was defined in the environment, use it. -IF(NOT SNDFILE_ROOT_DIR AND NOT $ENV{SNDFILE_ROOT_DIR} STREQUAL "") - SET(SNDFILE_ROOT_DIR $ENV{SNDFILE_ROOT_DIR}) +# If LIBSNDFILE_ROOT_DIR was defined in the environment, use it. +IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "") + SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR}) ENDIF() SET(_sndfile_SEARCH_DIRS - ${SNDFILE_ROOT_DIR} + ${LIBSNDFILE_ROOT_DIR} /usr/local /sw # Fink /opt/local # DarwinPorts ) -FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h +FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h HINTS ${_sndfile_SEARCH_DIRS} PATH_SUFFIXES include ) -FIND_LIBRARY(SNDFILE_LIBRARY +FIND_LIBRARY(LIBSNDFILE_LIBRARY NAMES sndfile HINTS @@ -50,18 +50,18 @@ FIND_LIBRARY(SNDFILE_LIBRARY lib64 lib ) -# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if +# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG - SNDFILE_LIBRARY SNDFILE_INCLUDE_DIR) + LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR) -IF(SNDFILE_FOUND) - SET(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY}) - SET(SNDFILE_INCLUDE_DIRS ${SNDFILE_INCLUDE_DIR}) -ENDIF(SNDFILE_FOUND) +IF(LIBSNDFILE_FOUND) + SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) + SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) +ENDIF(LIBSNDFILE_FOUND) MARK_AS_ADVANCED( - SNDFILE_INCLUDE_DIR - SNDFILE_LIBRARY + LIBSNDFILE_INCLUDE_DIR + LIBSNDFILE_LIBRARY ) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 406f50eb4f4..cf6a94303cf 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -319,7 +319,7 @@ function(SETUP_LIBDIRS) link_directories(${JACK_LIBPATH}) endif() if(WITH_CODEC_SNDFILE) - link_directories(${SNDFILE_LIBPATH}) + link_directories(${LIBSNDFILE_LIBPATH}) endif() if(WITH_FFTW3) link_directories(${FFTW3_LIBPATH}) @@ -400,7 +400,7 @@ function(setup_liblinks target_link_libraries(${target} ${JACK_LIBRARIES}) endif() if(WITH_CODEC_SNDFILE) - target_link_libraries(${target} ${SNDFILE_LIBRARIES}) + target_link_libraries(${target} ${LIBSNDFILE_LIBRARIES}) endif() if(WITH_SDL AND NOT WITH_SDL_DYNLOAD) target_link_libraries(${target} ${SDL_LIBRARY}) @@ -548,6 +548,12 @@ function(SETUP_BLENDER_SORTED_LIBS) endif() endif() + if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE) + list(APPEND BLENDER_LINK_LIBS + audaspace + audaspace-py) + endif() + # Sort libraries set(BLENDER_SORTED_LIBS bf_windowmanager @@ -578,12 +584,14 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_editor_curve bf_editor_gpencil bf_editor_interface + bf_editor_manipulator_library bf_editor_mesh bf_editor_metaball bf_editor_object bf_editor_armature bf_editor_physics bf_editor_render + bf_editor_scene bf_editor_screen bf_editor_sculpt_paint bf_editor_sound @@ -596,6 +604,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_python bf_python_ext bf_python_mathutils + bf_python_gawain bf_python_bmesh bf_freestyle bf_ikplugin @@ -603,11 +612,14 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_alembic bf_bmesh bf_gpu + bf_draw bf_blenloader bf_blenkernel bf_physics bf_nodes bf_rna + bf_editor_manipulator_library # rna -> manipulator bad-level calls + bf_python bf_imbuf bf_blenlib bf_depsgraph @@ -648,6 +660,8 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_blenfont bf_blentranslation bf_intern_audaspace + audaspace + audaspace-py bf_intern_mikktspace bf_intern_dualcon bf_intern_cycles @@ -659,6 +673,7 @@ function(SETUP_BLENDER_SORTED_LIBS) cycles_util cycles_subd bf_intern_opencolorio + bf_intern_gawain bf_intern_eigen extern_rangetree extern_wcwidth @@ -1501,6 +1516,7 @@ function(find_python_package NAMES ${package} HINTS + "${PYTHON_LIBPATH}/" "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/" "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/" PATH_SUFFIXES diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 1435572fa5e..ca01e08afe9 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -23,6 +23,8 @@ # Libraries configuration for Apple. +set(MACOSX_DEPLOYMENT_TARGET "10.9") + macro(find_package_wrapper) # do nothing, just satisfy the macro endmacro() @@ -40,7 +42,7 @@ if(WITH_OPENAL) find_package(OpenAL) if(OPENAL_FOUND) set(WITH_OPENAL ON) - set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include") + set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include/AL") else() set(WITH_OPENAL OFF) endif() @@ -76,10 +78,10 @@ if(WITH_JACK) endif() if(WITH_CODEC_SNDFILE) - set(SNDFILE ${LIBDIR}/sndfile) - set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include) - set(SNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc) - set(SNDFILE_LIBPATH ${SNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate + set(LIBSNDFILE ${LIBDIR}/sndfile) + set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) + set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc) + set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib) # TODO, deprecate endif() if(WITH_PYTHON) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 6796e254c27..306a09a3a5b 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -148,7 +148,7 @@ endif() # Codecs if(WITH_CODEC_SNDFILE) find_package_wrapper(SndFile) - if(NOT SNDFILE_FOUND) + if(NOT LIBSNDFILE_FOUND) set(WITH_CODEC_SNDFILE OFF) endif() endif() diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 4b444e63ebd..d59e9d70922 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -523,22 +523,21 @@ set(WINTAB_INC ${LIBDIR}/wintab/include) if(WITH_OPENAL) set(OPENAL ${LIBDIR}/openal) set(OPENALDIR ${LIBDIR}/openal) - set(OPENAL_INCLUDE_DIR ${OPENAL}/include) + set(OPENAL_INCLUDE_DIR ${OPENAL}/include/AL) set(OPENAL_LIBPATH ${OPENAL}/lib) if(MSVC) set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/openal32.lib) else() set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/wrap_oal.lib) endif() - + endif() if(WITH_CODEC_SNDFILE) - set(SNDFILE ${LIBDIR}/sndfile) - set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include) - set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate - set(SNDFILE_LIBRARIES ${SNDFILE_LIBPATH}/libsndfile-1.lib) - + set(LIBSNDFILE ${LIBDIR}/sndfile) + set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include) + set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib) # TODO, deprecate + set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBPATH}/libsndfile-1.lib) endif() if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) |