diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
| commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
| tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /build_files | |
| parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
| parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) | |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/sndfile.cmake | 2 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake index 282033d4905..2c4da159280 100644 --- a/build_files/build_environment/cmake/sndfile.cmake +++ b/build_files/build_environment/cmake/sndfile.cmake @@ -27,7 +27,7 @@ else() set(SNDFILE_OPTIONS --enable-static --disable-shared ) endif() -if(APPLE) +if(UNIX) set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff) else() set(SNDFILE_PATCH_CMD) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index c1ba2a3ab25..c474c39d910 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1650,7 +1650,6 @@ compile_OIIO() { cmake_d="$cmake_d -D LINKSTATIC=OFF" cmake_d="$cmake_d -D USE_SIMD=sse2" - cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION" cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION" if [ "$_with_built_openexr" = true ]; then @@ -1669,6 +1668,7 @@ compile_OIIO() { cmake_d="$cmake_d -D BUILD_TESTING=OFF" cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF" cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF" + cmake_d="$cmake_d -D TXT2MAN=" #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON" #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON" diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 64ff4fc3aff..dfac6d1798e 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -565,6 +565,9 @@ function(SETUP_BLENDER_SORTED_LIBS) set(BLENDER_SORTED_LIBS bf_windowmanager + # needed twice because of text undo + bf_editor_util + bf_editor_space_api bf_editor_space_action bf_editor_space_buttons @@ -689,6 +692,7 @@ function(SETUP_BLENDER_SORTED_LIBS) extern_sdlew bf_intern_glew_mx + bf_intern_clog ) if(NOT WITH_SYSTEM_GLOG) |