turns out recent commit made 'make' on its own fail.
This commit is contained in:
47
GNUmakefile
47
GNUmakefile
@@ -77,6 +77,28 @@ ifeq ($(OS), NetBSD)
|
|||||||
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
|
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
|
||||||
endif
|
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
|
# 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 " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
|
||||||
@echo ""
|
@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
|
# Packages
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user