From 1a5998bc4ecaf23db4dbcf41d3872019944c74ac Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 2 Aug 2012 16:42:30 +0000 Subject: Remove old boolean operation module Carve proved it's a way to go, so the time have came to get rid of old boolean operation module which isn't used anymore. Still kept BOP interface but move it to BSP module. At some point it could be cleaned up further (like perhaps removed extra abstraction level or so) but would be nice to combine such a refactor with making BSP aware of NGons. Tested on linux using both cmake and scons, possible regressions on windows/osx. Would check windoes build just after commit. --- intern/bsp/CMakeLists.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'intern/bsp/CMakeLists.txt') diff --git a/intern/bsp/CMakeLists.txt b/intern/bsp/CMakeLists.txt index 6a337b99be9..e492c04423e 100644 --- a/intern/bsp/CMakeLists.txt +++ b/intern/bsp/CMakeLists.txt @@ -29,6 +29,7 @@ set(INC ../guardedalloc ../memutil ../moto/include + ../../extern/carve/include ) set(INC_SYS @@ -36,15 +37,34 @@ set(INC_SYS ) set(SRC + intern/BOP_CarveInterface.cpp intern/BSP_CSGMesh.cpp intern/BSP_MeshPrimitives.cpp intern/CSG_BooleanOps.cpp extern/CSG_BooleanOps.h + intern/BOP_Interface.h intern/BSP_CSGException.h intern/BSP_CSGMesh.h intern/BSP_CSGMesh_CFIterator.h intern/BSP_MeshPrimitives.h ) +if(WITH_BOOST) + if(NOT MSVC) + # Boost is setting as preferred collections library in the Carve code when using MSVC compiler + add_definitions( + -DHAVE_BOOST_UNORDERED_COLLECTIONS + ) + endif() + + add_definitions( + -DCARVE_SYSTEM_BOOST + ) + + list(APPEND INC + ${BOOST_INCLUDE_DIR} + ) +endif() + blender_add_lib(bf_intern_bsp "${SRC}" "${INC}" "${INC_SYS}") -- cgit v1.2.3