[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42632] branches/carve_booleans: Carve booleans: switch to boost collections
Sergey Sharybin
sergey.vfx at gmail.com
Wed Dec 14 20:12:26 CET 2011
Revision: 42632
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42632
Author: nazgul
Date: 2011-12-14 19:12:06 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Carve booleans: switch to boost collections
Gives nice speedup when building with MSVC
Modified Paths:
--------------
branches/carve_booleans/extern/carve/CMakeLists.txt
branches/carve_booleans/extern/carve/SConscript
branches/carve_booleans/intern/boolop/CMakeLists.txt
branches/carve_booleans/intern/boolop/SConscript
Modified: branches/carve_booleans/extern/carve/CMakeLists.txt
===================================================================
--- branches/carve_booleans/extern/carve/CMakeLists.txt 2011-12-14 15:56:42 UTC (rev 42631)
+++ branches/carve_booleans/extern/carve/CMakeLists.txt 2011-12-14 19:12:06 UTC (rev 42632)
@@ -145,16 +145,15 @@
include/carve/collection_types.hpp
)
-# TODO: not supported yet
-#if(WITH_BOOST)
-# add_definitions(
-# -DHAVE_BOOST_UNORDERED_COLLECTIONS
-# -DCARVE_SYSTEM_BOOST
-# )
-#
-# list(APPEND INC
-# ${BOOST_INCLUDE_DIR}
-# )
-#endif()
+if(WITH_BOOST)
+ add_definitions(
+ -DHAVE_BOOST_UNORDERED_COLLECTIONS
+ -DCARVE_SYSTEM_BOOST
+ )
+ list(APPEND INC
+ ${BOOST_INCLUDE_DIR}
+ )
+endif()
+
blender_add_lib(extern_carve "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/carve_booleans/extern/carve/SConscript
===================================================================
--- branches/carve_booleans/extern/carve/SConscript 2011-12-14 15:56:42 UTC (rev 42631)
+++ branches/carve_booleans/extern/carve/SConscript 2011-12-14 19:12:06 UTC (rev 42632)
@@ -6,10 +6,9 @@
defs = []
incs = ['include']
-# TODO: not supported yet
-#if env['WITH_BF_BOOST']:
-# defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
-# defs.append('CARVE_SYSTEM_BOOST')
-# incs.append(env['BF_BOOST_INC'])
+if env['WITH_BF_BOOST']:
+ defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+ defs.append('CARVE_SYSTEM_BOOST')
+ incs.append(env['BF_BOOST_INC'])
env.BlenderLib ('extern_carve', Split(sources), incs, defs, libtype=['extern'], priority=[40] )
Modified: branches/carve_booleans/intern/boolop/CMakeLists.txt
===================================================================
--- branches/carve_booleans/intern/boolop/CMakeLists.txt 2011-12-14 15:56:42 UTC (rev 42631)
+++ branches/carve_booleans/intern/boolop/CMakeLists.txt 2011-12-14 19:12:06 UTC (rev 42632)
@@ -87,6 +87,17 @@
list(APPEND INC
../../extern/carve/include
)
+
+ if(WITH_BOOST)
+ add_definitions(
+ -DHAVE_BOOST_UNORDERED_COLLECTIONS
+ -DCARVE_SYSTEM_BOOST
+ )
+
+ list(APPEND INC
+ ${BOOST_INCLUDE_DIR}
+ )
+ endif()
endif()
blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/carve_booleans/intern/boolop/SConscript
===================================================================
--- branches/carve_booleans/intern/boolop/SConscript 2011-12-14 15:56:42 UTC (rev 42631)
+++ branches/carve_booleans/intern/boolop/SConscript 2011-12-14 19:12:06 UTC (rev 42632)
@@ -8,10 +8,16 @@
if not env['WITH_BF_CARVE']:
sources = env.Glob('intern/*.cpp')
sources.remove('intern' + os.sep + 'BOP_CarveInterface.cpp')
+
+ if env['WITH_BF_BOOST']:
+ defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+ defs.append('CARVE_SYSTEM_BOOST')
+ incs.append(env['BF_BOOST_INC'])
else:
sources = env.Glob('intern/BOP_CarveInterface.cpp')
incs += ' ../../extern/carve/include'
+
if (env['OURPLATFORM'] == 'win32-mingw'):
env.BlenderLib ('bf_intern_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
else:
More information about the Bf-blender-cvs
mailing list