diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-04-06 23:25:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-04-07 20:52:53 +0300 |
| commit | 0de0950ad5d1de5172cbd2b6b0e67fe319a420c1 (patch) | |
| tree | 54a1a3e8abdb9733f5f9287496d03515c9ff5987 /intern/cycles/util | |
| parent | 51a7e4b488a4df1ce6fec93ee599d70efdbf5e03 (diff) | |
Cycles: various Linux build fixes related to Hydra render delegate
* Add missing GLEW and hgiGL libraries for Hydra
* Fix wrong case sensitive include
* Fix link errors by adding external libs to static Hydra lib
* Work around weird Hydra link error with MAX_SAMPLES
* Use Embree by default for Hydra
* Sync external libs code with standalone
* Update version number to match Blender
* Remove unneeded CLEW/GLEW from test executable
None of this should affect Cycles in Blender.
Ref T96731
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/system.cpp | 1 | ||||
| -rw-r--r-- | intern/cycles/util/version.h | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/intern/cycles/util/system.cpp b/intern/cycles/util/system.cpp index 3241601d048..a13ad95b9fe 100644 --- a/intern/cycles/util/system.cpp +++ b/intern/cycles/util/system.cpp @@ -20,6 +20,7 @@ OIIO_NAMESPACE_USING # include <sys/ioctl.h> # include <sys/sysctl.h> # include <sys/types.h> +# include <unistd.h> #else # include <sys/ioctl.h> # include <unistd.h> diff --git a/intern/cycles/util/version.h b/intern/cycles/util/version.h index f13ba637424..8260dd4f55d 100644 --- a/intern/cycles/util/version.h +++ b/intern/cycles/util/version.h @@ -8,8 +8,8 @@ CCL_NAMESPACE_BEGIN -#define CYCLES_VERSION_MAJOR 1 -#define CYCLES_VERSION_MINOR 13 +#define CYCLES_VERSION_MAJOR 3 +#define CYCLES_VERSION_MINOR 2 #define CYCLES_VERSION_PATCH 0 #define CYCLES_MAKE_VERSION_STRING2(a, b, c) #a "." #b "." #c @@ -17,6 +17,10 @@ CCL_NAMESPACE_BEGIN #define CYCLES_VERSION_STRING \ CYCLES_MAKE_VERSION_STRING(CYCLES_VERSION_MAJOR, CYCLES_VERSION_MINOR, CYCLES_VERSION_PATCH) +/* Blender libraries version compatible with this version */ + +#define CYCLES_BLENDER_LIBRARIES_VERSION 3.1 + CCL_NAMESPACE_END #endif /* __UTIL_VERSION_H__ */ |