diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 14:03:13 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 14:03:13 +0400 |
| commit | 9978f97b1229c6836c17e7c7ade8005aa042d429 (patch) | |
| tree | c6d7d65d4accd285bc93b4f9640fda265ba5f29b /GNUmakefile | |
| parent | 857dedbc584fcf0af0afa13f008377fd9a83dad1 (diff) | |
cmake edits
- only show mingw option when building with mingw
- always run cmake configure with convenience build targets so failed configurations stop re-configuring.
- disable WITH_GHOST_XDND in 'make lite'
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 9 |
1 files changed, 6 insertions, 3 deletions
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 ... |