workaround for building blender with mingw, was giving syntax error, for now just...

[blender.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 0e1f57bd3dc15c2a7181b27890da1c69ba0b52fd..42d7c33e46b73c1025cd5e23ec2c0360b8c19143 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -52,7 +52,7 @@ ifeq ($(OS), Linux)
        NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
 endif
 ifeq ($(OS), Darwin)
-       NPROCS:=$(shell system_profiler | awk '/Number Of CPUs/{print $4}{next;}')
+       NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
 endif
 ifeq ($(OS), FreeBSD)
        NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
@@ -75,7 +75,7 @@ all:
 
        @echo 
        @echo Building Blender ...
-       cd $(BUILD_DIR) ; make -s -j $(NPROCS)
+       cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
        @echo 
        @echo run blender from "$(BUILD_DIR)/bin/blender"
        @echo 
@@ -90,6 +90,10 @@ package_debian:
 package_pacman:
        cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
+package_archive:
+       cd $(BUILD_DIR) ; make -s package_archive
+       @echo archive in "$(BUILD_DIR)/release"
+
 # forward build targets
 test:
        cd $(BUILD_DIR) ; ctest . --output-on-failure