diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-07-14 23:07:36 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-07-14 23:07:36 +0300 |
| commit | dc0c71d3ae772c9afdec0718ae135b9b91f57e8b (patch) | |
| tree | 3c89c71d0a33ecb3a3b4abfb67641051e34608f7 /source/blender/nodes/CMakeLists.txt | |
| parent | d7a74a2ad69914602f563852610efff3e8ed6e1c (diff) | |
| parent | 093074aefe87259882b56a911d8eeb311408ff14 (diff) | |
Merge branch 'master' into temp-geometry-nodes-curve-sample
Diffstat (limited to 'source/blender/nodes/CMakeLists.txt')
| -rw-r--r-- | source/blender/nodes/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index a7640d6cacd..09085ac8799 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -165,11 +165,12 @@ set(SRC geometry/nodes/node_geo_common.cc geometry/nodes/node_geo_convex_hull.cc geometry/nodes/node_geo_curve_endpoints.cc - geometry/nodes/node_geo_curve_length.cc + geometry/nodes/node_geo_curve_length.cc geometry/nodes/node_geo_curve_primitive_bezier_segment.cc geometry/nodes/node_geo_curve_primitive_circle.cc geometry/nodes/node_geo_curve_primitive_line.cc geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc + geometry/nodes/node_geo_curve_primitive_quadrilateral.cc geometry/nodes/node_geo_curve_primitive_spiral.cc geometry/nodes/node_geo_curve_primitive_star.cc geometry/nodes/node_geo_curve_sample.cc @@ -338,6 +339,7 @@ set(SRC texture/node_texture_util.c intern/derived_node_tree.cc + intern/geometry_nodes_eval_log.cc intern/math_functions.cc intern/node_common.c intern/node_exec.cc @@ -361,6 +363,7 @@ set(SRC NOD_function.h NOD_geometry.h NOD_geometry_exec.hh + NOD_geometry_nodes_eval_log.hh NOD_math_functions.hh NOD_node_tree_multi_function.hh NOD_node_tree_ref.hh @@ -421,6 +424,11 @@ if(WITH_TBB) ${TBB_INCLUDE_DIRS} ) add_definitions(-DWITH_TBB) + if(WIN32) + # TBB includes Windows.h which will define min/max macros + # that will collide with the stl versions. + add_definitions(-DNOMINMAX) + endif() endif() if(WITH_IMAGE_OPENEXR) |