Ray molenkamp
b9c37608a9
This only updates the build system, precompiled libraries for the various platforms will be committed over the coming week. New: fmt 8.0.0 level_zero v1.7.15 pystring v1.1.3 robinmap v0.6.2 webp 1.2.2 Updated: alembic 1.8.3 blosc 1.21.1 boost 1.78.0 embree 3.13.3 ffmpeg 5.0 fftw 3.3.10 flac 1.3.4 imath 3.1.4 ispc v1.17.0 jpeg 2.1.3 ogg 1.3.5 oidn 1.4.3 openal 1.21.1 opencolorio 2.1.1 openexr 3.1.4 openimageio v2.3.13.0 openjpeg 2.4.0 opensubdiv v3_4_4 openvdb 9.0.0 osl 1.11.17.0 sdl 2.0.20 tbb 2020_u3 tiff 4.3.0 usd 22.03 vorbis 1.3.7 vpx 1.11.0 x264 35fe20d1b zlib 1.2.12 Implemented by Ray Molenkamp, Sybren Stüvel and Brecht Van Lommel. Ref T95206
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
diff -Naur orig/common/sys/platform.h external_embree/common/sys/platform.h
|
|
--- orig/common/sys/platform.h 2020-05-13 23:08:53 -0600
|
|
+++ external_embree/common/sys/platform.h 2020-06-13 17:40:26 -0600
|
|
@@ -84,8 +84,8 @@
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifdef __WIN32__
|
|
-#define dll_export __declspec(dllexport)
|
|
-#define dll_import __declspec(dllimport)
|
|
+#define dll_export
|
|
+#define dll_import
|
|
#else
|
|
#define dll_export __attribute__ ((visibility ("default")))
|
|
#define dll_import
|
|
diff --git orig/common/tasking/CMakeLists.txt external_embree/common/tasking/CMakeLists.txt
|
|
--- orig/common/tasking/CMakeLists.txt
|
|
+++ external_embree/common/tasking/CMakeLists.txt
|
|
@@ -27,7 +27,11 @@
|
|
else()
|
|
# If not found try getting older TBB via module (FindTBB.cmake)
|
|
unset(TBB_DIR CACHE)
|
|
- find_package(TBB 4.1 REQUIRED tbb)
|
|
+ if (TBB_STATIC_LIB)
|
|
+ find_package(TBB 4.1 REQUIRED tbb_static)
|
|
+ else()
|
|
+ find_package(TBB 4.1 REQUIRED tbb)
|
|
+ endif()
|
|
if (TBB_FOUND)
|
|
TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
|
|
TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")
|