Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixes for GNUmakefile on Mac:

Browse Source 
* 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.
This commit is contained in:
Brecht Van Lommel
2011-03-14 15:40:07 +00:00
parent 7e69bad1c3
commit c13947fe33
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
GNUmakefile
View File

@@ -48,11 +48,14 @@ endif
# Get the number of cores for threaded build # Get the number of cores for threaded build
NPROCS:=1 NPROCS:=1
DEFAULT_TARGET=install
ifeq ($(OS), Linux) ifeq ($(OS), Linux)
NPROCS:=$(shell grep -c ^processor /proc/cpuinfo) NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
endif endif
ifeq ($(OS), Darwin) 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 endif
ifeq ($(OS), FreeBSD) ifeq ($(OS), FreeBSD)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 ) NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
@@ -75,7 +78,7 @@ all:
@echo @echo
@echo Building Blender ... @echo Building Blender ...
cd $(BUILD_DIR) ; make -s -j $(NPROCS) install cd $(BUILD_DIR) ; make -s -j $(NPROCS) ${DEFAULT_TARGET}
@echo @echo
@echo run blender from "$(BUILD_DIR)/bin/blender" @echo run blender from "$(BUILD_DIR)/bin/blender"
@echo @echo

1
source/creator/CMakeLists.txt
View File

@@ -529,6 +529,7 @@ if(WITH_INSTALL)
elseif(APPLE) elseif(APPLE)
# TODO, APPLE needs a 'make install' target like win32 and unix # TODO, APPLE needs a 'make install' target like win32 and unix
# also update GNUmakefile to run make install if you do this
set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist) set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)