diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-03-14 18:40:07 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-03-14 18:40:07 +0300 |
| commit | c13947fe337f56b3982c4b1f8a48c170aa4510d5 (patch) | |
| tree | 9823dd0132faba1b6817587354cc22b1fda67996 /GNUmakefile | |
| parent | 7e69bad1c34cb50b76e27bdacf3be3a35fe67e85 (diff) | |
Fixes for GNUmakefile on Mac:
* Don't use "make install", doesn't work yet.
* Use total number of cores rather than number of processors.
* Quicker number of cores query, by not asking for all system info.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 265826f3125..e8571064883 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -48,11 +48,14 @@ endif # Get the number of cores for threaded build NPROCS:=1 +DEFAULT_TARGET=install 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 system_profiler SPHardwareDataType | awk '/Total Number Of Cores/ {print $5}{next;};') + # make install not support on mac yet + DEFAULT_TARGET= endif ifeq ($(OS), FreeBSD) NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 ) @@ -75,7 +78,7 @@ all: @echo @echo Building Blender ... - cd $(BUILD_DIR) ; make -s -j $(NPROCS) install + cd $(BUILD_DIR) ; make -s -j $(NPROCS) ${DEFAULT_TARGET} @echo @echo run blender from "$(BUILD_DIR)/bin/blender" @echo |