diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | GNUmakefile | 9 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89fe482d7ec..038d6a075dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,8 +229,10 @@ option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install fol set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module") mark_as_advanced(PYTHON_NUMPY_PATH) -option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF) -mark_as_advanced(WITH_MINGW64) +if(MINGW) + option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF) + mark_as_advanced(WITH_MINGW64) +endif() # Cycles option(WITH_CYCLES "Enable cycles Render Engine" ON) diff --git a/GNUmakefile b/GNUmakefile index f2ac0285407..f5cba00d452 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -109,9 +109,12 @@ all: @echo @echo Configuring Blender ... - if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ - $(CMAKE_CONFIG); \ - fi + # if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ + # $(CMAKE_CONFIG); \ + # fi + + # do this always incase of failed initial build, could be smarter here... + $(CMAKE_CONFIG) @echo @echo Building Blender ... diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index e72a0fff355..d19f0cf32e8 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -17,6 +17,7 @@ set(WITH_FFTW3 OFF CACHE FORCE BOOL) set(WITH_LIBMV OFF CACHE FORCE BOOL) set(WITH_CARVE OFF CACHE FORCE BOOL) set(WITH_GAMEENGINE OFF CACHE FORCE BOOL) +set(WITH_GHOST_XDND OFF CACHE FORCE BOOL) set(WITH_IK_ITASC OFF CACHE FORCE BOOL) set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL) set(WITH_IMAGE_DDS OFF CACHE FORCE BOOL) |