diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:58:06 +0400 |
commit | e6e265b2b59e02cc7816a2ed43471eca8bca0a62 (patch) | |
tree | e312d2c2f6cb1aaf79148648e5725902ab23d34e /GNUmakefile | |
parent | e59ab6486f9e7285815671044b785c28365d5165 (diff) | |
parent | 3442c16c09b31a23f45b23be72e6eb5ba02c7bbf (diff) |
svn merge -r41779:41847 ^/trunk/blender
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 640e90de74b..2ac3439d6aa 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,7 +34,10 @@ OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]') # Source and Build DIR's BLENDER_DIR:=$(shell pwd -P) BUILD_TYPE:=Release -BUILD_CMAKE_ARGS:= + +ifndef BUILD_CMAKE_ARGS + BUILD_CMAKE_ARGS:= +endif ifndef BUILD_DIR BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE) @@ -123,6 +126,7 @@ help: @echo " * bpy - build as a python module which can be loaded from python directly" @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 "" @echo "" @echo "Project Files for IDE's" |