diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-23 21:14:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-23 21:14:29 +0400 |
commit | 28fb329419b4e636bb9540ba090de8e2c28d582f (patch) | |
tree | b510b929ef1a2b16216d9b60bd29595470005164 /GNUmakefile | |
parent | a91bd43d382b857abb4440fe5a2353a4fac0519d (diff) |
minor changes
- avoid duplicate image enum definitions.
- move image UI format & bw/rgb/rgba onto 1 line.
- add 'make config' convenience target to run ccmake or cmake-gui
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 2ac3439d6aa..478f0c35a1c 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -93,6 +93,17 @@ CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \ # ----------------------------------------------------------------------------- +# Tool for 'make config' + +# X11 spesific +ifdef DISPLAY + CMAKE_CONFIG_TOOL = cmake-gui +else + CMAKE_CONFIG_TOOL = ccmake +endif + + +# ----------------------------------------------------------------------------- # Build Blender all: @echo @@ -115,8 +126,15 @@ lite: all headless: all bpy: all + # ----------------------------------------------------------------------------- -# Helo for build targets +# Configuration (save some cd'ing around) +config: + $(CMAKE_CONFIG_TOOL) $(BUILD_DIR) + + +# ----------------------------------------------------------------------------- +# Help for build targets help: @echo "" @echo "Convenience targets provided for building blender, (multiple at once can be used)" @@ -125,6 +143,8 @@ help: @echo " * headless - build without an interface (renderfarm or server automation)" @echo " * bpy - build as a python module which can be loaded from python directly" @echo "" + @echo " * config - run cmake configuration tool to set build options" + @echo "" @echo " Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir." @echo " Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments." @echo "" |