diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-16 17:45:17 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-16 17:45:17 +0400 |
| commit | 6b1fd66e3b7c03b4521b7184b900dce858f57d9d (patch) | |
| tree | 400dae2f3ec04ad14181bea1843ae9fcdb3a0e0d /GNUmakefile | |
| parent | e98074d327217d1fcc205aaff995a1bded08971a (diff) | |
turns out recent commit made 'make' on its own fail.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 47 |
1 files changed, 22 insertions, 25 deletions
diff --git a/GNUmakefile b/GNUmakefile index 4aaa77ee52d..8446541cfae 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -77,6 +77,28 @@ ifeq ($(OS), NetBSD) NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 ) endif +# ----------------------------------------------------------------------------- +# Build Blender +all: + @echo + @echo Configuring Blender ... + + if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ + cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \ + fi + + @echo + @echo Building Blender ... + $(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install + @echo + @echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild. + @echo blender installed, run from: "$(BUILD_DIR)/bin/blender" + @echo + +debug: all +lite: all +headless: all +bpy: all # ----------------------------------------------------------------------------- # Helo for build targets @@ -105,31 +127,6 @@ help: @echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed" @echo "" - -# ----------------------------------------------------------------------------- -# Build Blender -all: - @echo - @echo Configuring Blender ... - - if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \ - cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \ - fi - - @echo - @echo Building Blender ... - $(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install - @echo - @echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild. - @echo blender installed, run from: "$(BUILD_DIR)/bin/blender" - @echo - -debug: all -lite: all -headless: all -bpy: all - - # ----------------------------------------------------------------------------- # Packages # |