diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-11-18 08:39:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-18 08:39:16 +0300 |
| commit | dc8be23234a86186d9768b47ffcce9d801d6bae7 (patch) | |
| tree | 3784c2ed9315db9cd601b2a0cf6f2188a2126133 | |
| parent | 11549098eab8c1a9773185f5425fbc59c3376af4 (diff) | |
| parent | 99640d06223428efef58a42438d4021d7d983e67 (diff) | |
Merge branch 'blender-v2.81-release'
| -rw-r--r-- | GNUmakefile | 5 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/readfile.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index 2c7856db7b4..accedbbbe4b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -276,7 +276,10 @@ ifndef NPROCS ifeq ($(OS), Linux) NPROCS:=$(shell nproc) endif - ifneq (,$(filter $(OS),Darwin FreeBSD NetBSD)) + ifeq ($(OS), NetBSD) + NPROCS:=$(shell getconf NPROCESSORS_ONLN) + endif + ifneq (,$(filter $(OS),Darwin FreeBSD)) NPROCS:=$(shell sysctl -n hw.ncpu) endif endif diff --git a/source/blender/blenloader/intern/readfile.h b/source/blender/blenloader/intern/readfile.h index 10ee3d52a74..fb307f6bde3 100644 --- a/source/blender/blenloader/intern/readfile.h +++ b/source/blender/blenloader/intern/readfile.h @@ -53,7 +53,7 @@ enum eFileDataFlag { # pragma GCC poison off_t #endif -#if defined(_MSC_VER) || defined(__APPLE__) || defined(__HAIKU__) +#if defined(_MSC_VER) || defined(__APPLE__) || defined(__HAIKU__) || defined(__NetBSD__) typedef int64_t off64_t; #endif |