diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/creator/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | source/creator/creator.c | 5 |
2 files changed, 20 insertions, 0 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 50b4f3edfa9..8a85c75cade 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -81,6 +81,12 @@ if(WITH_CODEC_FFMPEG) add_definitions(-DWITH_FFMPEG) endif() +if(WITH_TBB) + blender_include_dirs(${TBB_INCLUDE_DIRS}) + link_directories(${LIBDIR}/tbb/lib) +endif() + + if(WITH_PYTHON) blender_include_dirs(../blender/python) add_definitions(-DWITH_PYTHON) @@ -806,6 +812,15 @@ elseif(WIN32) ) endif() + if(WITH_TBB_MALLOC_PROXY) + install( + FILES + ${LIBDIR}/tbb/lib/tbbmalloc.dll + ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll + DESTINATION "." + ) + endif() + if(WITH_CODEC_SNDFILE) install( FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll diff --git a/source/creator/creator.c b/source/creator/creator.c index 3632eb9eb9a..f6c2b707c8f 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -29,6 +29,11 @@ # include "utfconv.h" #endif +#if defined(WITH_TBB_MALLOC) && defined(_MSC_VER) +# pragma comment(lib, "tbbmalloc_proxy.lib") +# pragma comment(linker, "/include:__TBB_malloc_proxy") +#endif + #include "MEM_guardedalloc.h" #include "CLG_log.h" |