From 47e313ec0cb367e3fcd8fa7aa8adeeb8a4580f13 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 18 Aug 2012 13:36:29 +0000 Subject: cmake option to build without iksolver --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 94eea7bd6aa..fd473889909 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,7 @@ option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid d option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF) option(WITH_BUILDINFO "Include extra build details (only disable for development & faster builds)" ON) option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON) +option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON) option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF) option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_GAMEENGINE "Enable Game Engine" ON) -- cgit v1.2.3 From 455c37c16b40746d796598a9d63c19491b7a2698 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 19 Aug 2012 22:19:19 +0000 Subject: option to build without the legacy compositor --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index fd473889909..338135f4987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,6 +132,7 @@ option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_GAMEENGINE "Enable Game Engine" ON) option(WITH_PLAYER "Build Player" OFF) option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON) +option(WITH_COMPOSITOR_LEGACY "Enable legacy compositor" ON) # GHOST Windowing Library Options option(WITH_GHOST_DEBUG "Enable debugging output for the GHOST library" OFF) @@ -1796,6 +1797,7 @@ if(FIRST_RUN) info_cfg_option(WITH_GAMEENGINE) info_cfg_option(WITH_PLAYER) info_cfg_option(WITH_BULLET) + info_cfg_option(WITH_IK_SOLVER) info_cfg_option(WITH_IK_ITASC) info_cfg_option(WITH_OPENCOLLADA) info_cfg_option(WITH_FFTW3) -- cgit v1.2.3 From 3793e178f46b571a9c026e139eac1bbe59b83c82 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Wed, 22 Aug 2012 00:06:09 +0000 Subject: Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well. This should make MinGW64 builds quite stable again :) --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 338135f4987..6bb5d8af627 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1043,6 +1043,8 @@ elseif(WIN32) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread") add_definitions(-DFREE_WINDOWS64 -DMS_WIN64) + #Turn off OpenMP since it causes crashes on render for subsurfed/multiresolution meshes + set(WITH_OPENMP OFF) endif() add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE) -- cgit v1.2.3