diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-03-11 19:00:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-11 19:00:06 +0300 |
| commit | fbb1b311ea189b4d215cdfca3f507acb29ad2f3f (patch) | |
| tree | da426f375bb7ffc5cad6227931fa99ee8a5e9919 /GNUmakefile | |
| parent | cdb7498f663e539f05bc314c4e80c55ba45cdc02 (diff) | |
| parent | bcc8c04db4a111b692660a7706757290a5f03465 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 8fa9571dca6..7ee011911f8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,4 +1,4 @@ -# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*- +# -*- mode: gnumakefile; tab-width: 4; indent-tabs-mode: t; -*- # vim: tabstop=4 # # ##### BEGIN GPL LICENSE BLOCK ##### @@ -113,7 +113,7 @@ CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \ # X11 spesific ifdef DISPLAY CMAKE_CONFIG_TOOL = cmake-gui -else +else CMAKE_CONFIG_TOOL = ccmake endif @@ -127,7 +127,7 @@ all: .FORCE # # 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) |