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

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 ""