diff options
Diffstat (limited to 'build_files')
22 files changed, 86 insertions, 134 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 19278e1a086..b480f4a9c4e 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,with-embree,\ ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\ force-all,force-python,force-numpy,force-boost,\ @@ -106,11 +106,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 @@ -2810,10 +2805,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 "" @@ -3426,10 +3421,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 @@ -3850,10 +3845,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 9ba91a9a463..44048f70135 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -31,9 +31,8 @@ else() message(FATAL_ERROR "Unknown build environment") endif() -# Default to only build Blender, not the player +# Default to only build Blender set(WITH_BLENDER ON CACHE BOOL "" FORCE) -set(WITH_PLAYER OFF CACHE BOOL "" FORCE) # ######## Linux-specific build options ######## # Options which are specific to Linux-only platforms diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake deleted file mode 100644 index 69ab984e386..00000000000 --- a/build_files/buildbot/config/blender_linux_player.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# This is applied as an override on top of blender_linux.config -# Disables all the areas which are not needed for the player. -set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) -set(WITH_CYCLES OFF CACHE BOOL "" FORCE) -set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) -set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) -set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE) -set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) -set(WITH_LIBMV OFF CACHE BOOL "" FORCE) - -set(WITH_BLENDER OFF CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index c282e3624c2..102fbd903e2 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -60,7 +60,6 @@ if 'cmake' in builder: # Config file to be used (relative to blender's sources root) cmake_config_file = "build_files/cmake/config/blender_release.cmake" - cmake_player_config_file = None cmake_cuda_config_file = None # Set build options. @@ -106,14 +105,13 @@ if 'cmake' in builder: elif glibc == 'glibc211': deb_name = "squeeze" cmake_config_file = "build_files/buildbot/config/blender_linux.cmake" - cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake" if builder.endswith('x86_64_cmake'): chroot_name = 'buildbot_' + deb_name + '_x86_64' - targets = ['player', 'blender'] + targets = ['blender'] elif builder.endswith('i686_cmake'): bits = 32 chroot_name = 'buildbot_' + deb_name + '_i686' - targets = ['player', 'blender'] + targets = ['blender'] if deb_name != "stretch": cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) @@ -177,9 +175,7 @@ if 'cmake' in builder: target_name = 'install' # Tweaking CMake options to respect the target target_cmake_options = cmake_options[:] - if target == 'player': - target_cmake_options.append("-C" + os.path.join(blender_dir, cmake_player_config_file)) - elif target == 'cuda': + if target == 'cuda': target_cmake_options += cuda_cmake_options target_chroot_prefix = cuda_chroot_prefix[:] target_name = 'cycles_kernel_cuda' diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index a0b5e8c6517..22cf386c77a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -126,7 +126,6 @@ if builder.find('cmake') != -1: elif builder.startswith('linux_'): blender = os.path.join(install_dir, 'blender') - blenderplayer = os.path.join(install_dir, 'blenderplayer') buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h") blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h") @@ -149,7 +148,7 @@ if builder.find('cmake') != -1: # Strip all unused symbols from the binaries print("Stripping binaries...") chroot_prefix = ['schroot', '-c', chroot_name, '--'] - subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer]) + subprocess.call(chroot_prefix + ['strip', '--strip-all', blender]) print("Stripping python...") py_target = os.path.join(install_dir, blender_version) diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index 0504e75787b..b36a3272e3d 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 3b4ab38e842..ef6fb73598f 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/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index ba1334d750e..dd80013cb91 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -32,6 +32,7 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) ${EXTRA_LIBS} ${PLATFORM_LINKLIBS} bf_testing_main + bf_intern_eigen bf_intern_guardedalloc extern_gtest extern_gmock diff --git a/build_files/cmake/cmake_consistency_check_config.py b/build_files/cmake/cmake_consistency_check_config.py index ea119616993..7ecfe6f1e5f 100644 --- a/build_files/cmake/cmake_consistency_check_config.py +++ b/build_files/cmake/cmake_consistency_check_config.py @@ -37,6 +37,7 @@ IGNORE_SOURCE = ( ) IGNORE_CMAKE = ( + "extern/audaspace/CMakeLists.txt", ) UTF8_CHECK = True diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index c5d8c34b3cd..9dffc01cf2a 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -15,7 +15,6 @@ set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE) set(WITH_FFTW3 ON CACHE BOOL "" FORCE) set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE) set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) @@ -23,7 +22,6 @@ set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE) set(WITH_IK_ITASC ON CACHE BOOL "" FORCE) set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE) set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE) -set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE) set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE) set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE) set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE) @@ -42,6 +40,7 @@ set(WITH_OPENAL ON CACHE BOOL "" FORCE) set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE) set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE) set(WITH_OPENMP ON CACHE BOOL "" FORCE) +set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_OPENVDB ON CACHE BOOL "" FORCE) set(WITH_OPENVDB_BLOSC ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) @@ -50,7 +49,6 @@ set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) @@ -58,13 +56,10 @@ set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) if(UNIX AND NOT APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) - set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) elseif(WIN32) set(WITH_JACK OFF CACHE BOOL "" FORCE) - set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) elseif(APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) - set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) # include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") endif() diff --git a/build_files/cmake/config/blender_headless.cmake b/build_files/cmake/config/blender_headless.cmake index 18a023af99c..a07a3a7f66c 100644 --- a/build_files/cmake/config/blender_headless.cmake +++ b/build_files/cmake/config/blender_headless.cmake @@ -6,7 +6,6 @@ # set(WITH_HEADLESS ON CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) # disable audio, its possible some devs may want this but for now disable # so the python module doesn't hold the audio device and loads quickly. diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 5d53a508bba..d440dbf2821 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -20,7 +20,6 @@ set(WITH_CYCLES_OSL OFF CACHE BOOL "" FORCE) set(WITH_FFTW3 OFF CACHE BOOL "" FORCE) set(WITH_LIBMV OFF CACHE BOOL "" FORCE) set(WITH_LLVM OFF CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) @@ -28,7 +27,6 @@ set(WITH_IK_SOLVER OFF CACHE BOOL "" FORCE) set(WITH_IK_ITASC OFF CACHE BOOL "" FORCE) set(WITH_IMAGE_CINEON OFF CACHE BOOL "" FORCE) set(WITH_IMAGE_DDS OFF CACHE BOOL "" FORCE) -set(WITH_IMAGE_FRAMESERVER OFF CACHE BOOL "" FORCE) set(WITH_IMAGE_HDR OFF CACHE BOOL "" FORCE) set(WITH_IMAGE_OPENEXR OFF CACHE BOOL "" FORCE) set(WITH_IMAGE_OPENJPEG OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index a43470f4e1e..ac19ed29997 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -16,7 +16,6 @@ set(WITH_CYCLES_OSL ON CACHE BOOL "" FORCE) set(WITH_FFTW3 ON CACHE BOOL "" FORCE) set(WITH_LIBMV ON CACHE BOOL "" FORCE) set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE) -set(WITH_GAMEENGINE ON CACHE BOOL "" FORCE) set(WITH_COMPOSITOR ON CACHE BOOL "" FORCE) set(WITH_FREESTYLE ON CACHE BOOL "" FORCE) set(WITH_GHOST_XDND ON CACHE BOOL "" FORCE) @@ -24,7 +23,6 @@ set(WITH_IK_SOLVER ON CACHE BOOL "" FORCE) set(WITH_IK_ITASC ON CACHE BOOL "" FORCE) set(WITH_IMAGE_CINEON ON CACHE BOOL "" FORCE) set(WITH_IMAGE_DDS ON CACHE BOOL "" FORCE) -set(WITH_IMAGE_FRAMESERVER ON CACHE BOOL "" FORCE) set(WITH_IMAGE_HDR ON CACHE BOOL "" FORCE) set(WITH_IMAGE_OPENEXR ON CACHE BOOL "" FORCE) set(WITH_IMAGE_OPENJPEG ON CACHE BOOL "" FORCE) @@ -43,6 +41,7 @@ set(WITH_OPENAL ON CACHE BOOL "" FORCE) set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE) set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE) set(WITH_OPENMP ON CACHE BOOL "" FORCE) +set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) set(WITH_OPENVDB ON CACHE BOOL "" FORCE) set(WITH_OPENVDB_BLOSC ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) @@ -51,7 +50,6 @@ set(WITH_SDL ON CACHE BOOL "" FORCE) set(WITH_X11_XINPUT ON CACHE BOOL "" FORCE) set(WITH_X11_XF86VMODE ON CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) set(WITH_MEM_JEMALLOC ON CACHE BOOL "" FORCE) set(WITH_CYCLES_CUDA_BINARIES ON CACHE BOOL "" FORCE) set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_72;sm_75 CACHE STRING "" FORCE) @@ -60,13 +58,10 @@ set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm if(UNIX AND NOT APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_DOC_MANPAGE ON CACHE BOOL "" FORCE) - set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) elseif(WIN32) set(WITH_JACK OFF CACHE BOOL "" FORCE) - set(WITH_OPENSUBDIV ON CACHE BOOL "" FORCE) elseif(APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) - set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) # include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") endif() diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake index c90fafc60ab..64f7f78a286 100644 --- a/build_files/cmake/config/bpy_module.cmake +++ b/build_files/cmake/config/bpy_module.cmake @@ -12,9 +12,6 @@ set(WITH_INSTALL_PORTABLE OFF CACHE BOOL "" FORCE) # no point int copying python into python set(WITH_PYTHON_INSTALL OFF CACHE BOOL "" FORCE) -# dont build the game engine -set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) - # disable audio, its possible some devs may want this but for now disable # so the python module doesn't hold the audio device and loads quickly. set(WITH_AUDASPACE OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/cycles_standalone.cmake b/build_files/cmake/config/cycles_standalone.cmake index 45f9c100f93..1b12f4de23f 100644 --- a/build_files/cmake/config/cycles_standalone.cmake +++ b/build_files/cmake/config/cycles_standalone.cmake @@ -6,7 +6,6 @@ # disable Blender set(WITH_BLENDER OFF CACHE BOOL "" FORCE) -set(WITH_PLAYER OFF CACHE BOOL "" FORCE) set(WITH_CYCLES_BLENDER OFF CACHE BOOL "" FORCE) # build Cycles diff --git a/build_files/cmake/example_scripts/cmake_linux_install.sh b/build_files/cmake/example_scripts/cmake_linux_install.sh index 34bbe104b3b..5599863ff81 100755 --- a/build_files/cmake/example_scripts/cmake_linux_install.sh +++ b/build_files/cmake/example_scripts/cmake_linux_install.sh @@ -4,7 +4,7 @@ # assumes you have dependencies installed already # See this page for more info: -# http://wiki.blender.org/index.php/Dev:Doc/Building_Blender/Linux/Generic_Distro/CMake +# https://wiki.blender.org/wiki/Building_Blender/Linux/Generic_Distro/CMake # grab blender mkdir ~/blender-git @@ -38,4 +38,3 @@ echo " Update Blender: git pull --rebase; git submodule foreach git pull --reb echo " Reconfigure Blender: cd ~/blender-git/build-cmake ; cmake ." echo " Build Blender: cd ~/blender-git/build-cmake ; make" echo "" - diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 2e7ed801846..e250eae19a4 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -326,7 +326,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}) @@ -417,7 +417,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}) @@ -565,6 +565,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 @@ -585,25 +591,28 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_editor_space_outliner bf_editor_space_script bf_editor_space_sequencer + bf_editor_space_statusbar bf_editor_space_text bf_editor_space_time + bf_editor_space_topbar bf_editor_space_userpref bf_editor_space_view3d bf_editor_space_clip bf_editor_transform - bf_editor_util bf_editor_uvedit bf_editor_curve - bf_editor_gpencil bf_editor_interface + bf_editor_gizmo_library bf_editor_mesh bf_editor_metaball bf_editor_object + bf_editor_gpencil bf_editor_lattice bf_editor_armature bf_editor_physics bf_editor_render + bf_editor_scene bf_editor_screen bf_editor_sculpt_paint bf_editor_sound @@ -611,23 +620,31 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_editor_datafiles bf_editor_mask bf_editor_io + bf_editor_util bf_render bf_python bf_python_ext bf_python_mathutils + bf_python_gpu bf_python_bmesh bf_freestyle bf_ikplugin bf_modifiers + bf_gpencil_modifiers bf_alembic bf_bmesh bf_gpu + bf_draw bf_blenloader bf_blenkernel + bf_shader_fx + bf_gpencil_modifiers bf_physics bf_nodes bf_rna + bf_editor_gizmo_library # rna -> gizmo bad-level calls + bf_python bf_imbuf bf_blenlib bf_depsgraph @@ -644,30 +661,19 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_intern_guardedalloc bf_intern_ctr bf_intern_utfconv - ge_blen_routines - ge_converter - ge_phys_dummy - ge_phys_bullet bf_intern_smoke extern_lzma extern_curve_fit_nd - ge_logic_ketsji - extern_recastnavigation - ge_logic - ge_rasterizer - ge_oglrasterizer - ge_logic_expressions - ge_scenegraph - ge_logic_network - ge_logic_ngnetwork - ge_logic_loopbacknetwork bf_intern_moto extern_openjpeg - ge_videotex bf_dna + bf_blenfont + bf_gpu # duplicate for blenfont bf_blentranslation bf_intern_audaspace + audaspace + audaspace-py bf_intern_mikktspace bf_intern_dualcon bf_intern_cycles @@ -679,6 +685,7 @@ function(SETUP_BLENDER_SORTED_LIBS) cycles_util cycles_subd bf_intern_opencolorio + bf_intern_gawain bf_intern_eigen extern_rangetree extern_wcwidth @@ -687,6 +694,7 @@ function(SETUP_BLENDER_SORTED_LIBS) bf_intern_glew_mx bf_intern_clog + bf_intern_opensubdiv bf_intern_numaapi ) @@ -753,21 +761,13 @@ function(SETUP_BLENDER_SORTED_LIBS) endif() if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET) - list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet") - endif() - - if(WITH_GAMEENGINE_DECKLINK) - list(APPEND BLENDER_SORTED_LIBS bf_intern_decklink) + list_insert_after(BLENDER_SORTED_LIBS "extern_openjpeg" "extern_bullet") endif() if(WIN32) list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect) endif() - if(WITH_OPENSUBDIV) - list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv) - endif() - if(WITH_OPENVDB) list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb) endif() @@ -1388,6 +1388,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 4e78737fd9e..55642b534c2 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() @@ -78,10 +80,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) @@ -112,7 +114,7 @@ if(WITH_PYTHON) set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}") # needed for Audaspace, numpy is installed into python site-packages - set(NUMPY_INCLUDE_DIRS "${PYTHON_LIBPATH}/site-packages/numpy/core/include") + set(PYTHON_NUMPY_INCLUDE_DIRS "${PYTHON_LIBPATH}/site-packages/numpy/core/include") if(NOT EXISTS "${PYTHON_EXECUTABLE}") message(FATAL_ERROR "Python executable missing: ${PYTHON_EXECUTABLE}") diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index ff4c31d69c3..f9ea9420e97 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -155,7 +155,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 85974bc3788..04ab2aeb93a 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -567,11 +567,10 @@ if(WITH_OPENAL) 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) diff --git a/build_files/windows/parse_arguments.cmd b/build_files/windows/parse_arguments.cmd index 30bd2ebdcd2..2c80a4d0b02 100644 --- a/build_files/windows/parse_arguments.cmd +++ b/build_files/windows/parse_arguments.cmd @@ -12,9 +12,6 @@ if NOT "%1" == "" ( if "%1" == "debug" ( set BUILD_TYPE=Debug REM Build Configurations - ) else if "%1" == "noge" ( - set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_GAMEENGINE=OFF -DWITH_PLAYER=OFF - set BUILD_NGE=_noge ) else if "%1" == "builddir" ( set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2" shift /1 diff --git a/build_files/windows/update_sources.cmd b/build_files/windows/update_sources.cmd index 22d93fabb95..be5303ad1b5 100644 --- a/build_files/windows/update_sources.cmd +++ b/build_files/windows/update_sources.cmd @@ -11,6 +11,10 @@ if "%GIT%" == "" ( goto EOF ) "%GIT%" pull --rebase -"%GIT%" submodule foreach git pull --rebase origin master +"%GIT%" submodule update --init --recursive +rem Use blender2.8 branch for submodules that have it. +"%GIT%" submodule foreach "git checkout blender2.8 || git checkout master" +"%GIT%" submodule foreach git pull --rebase origin + :EOF
\ No newline at end of file |