From a67aa11b12ec27a1abb9badb513a516c8d90daf5 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 8 Nov 2019 09:01:00 -0700 Subject: Windows: Switch to the dynamic C runtime This change switches windows to the dynamic C runtime avoiding issues coming from mixing the static and dynamic runtime like the ones outlined in [1] [1] https://developer.blender.org/D5387#122165 Differential Revision: https://developer.blender.org/D6175 Reviewed by: @Sergey --- intern/cycles/CMakeLists.txt | 3 +++ intern/openvdb/CMakeLists.txt | 6 ++++++ 2 files changed, 9 insertions(+) (limited to 'intern') diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index a32911568c5..6f6bd7ec2cc 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -362,6 +362,9 @@ if(WITH_OPENCOLORIO) SYSTEM ${OPENCOLORIO_INCLUDE_DIRS} ) + if(WIN32) + add_definitions(-DOpenColorIO_STATIC) + endif() endif() if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK OR WITH_CYCLES_CUBIN_COMPILER) diff --git a/intern/openvdb/CMakeLists.txt b/intern/openvdb/CMakeLists.txt index 412dade0f1a..5d51e6c3dbc 100644 --- a/intern/openvdb/CMakeLists.txt +++ b/intern/openvdb/CMakeLists.txt @@ -40,6 +40,12 @@ if(WITH_OPENVDB) ${OPENVDB_DEFINITIONS} ) + if(WIN32) + add_definitions( + -DOPENVDB_STATICLIB + ) + endif() + if(WITH_OPENVDB_3_ABI_COMPATIBLE) add_definitions( -DOPENVDB_3_ABI_COMPATIBLE -- cgit v1.2.3