Commit: 99640d06223428efef58a42438d4021d7d983e67
Author: Campbell Barton
Date: Mon Nov 18 16:27:06 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB99640d06223428efef58a42438d4021d7d983e67
Fix building on NetBSD
===================================================================
M GNUmakefile
M source/blender/blenloader/intern/readfile.h
===================================================================
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
