Revision: 42628
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42628
Author: nazgul
Date: 2011-12-14 10:29:41 +0000 (Wed, 14 Dec 2011)
Log Message:
-----------
Carve booleans: enable by default for scons, removed unused file
Modified Paths:
--------------
branches/carve_booleans/build_files/scons/tools/btools.py
branches/carve_booleans/extern/carve/CMakeLists.txt
branches/carve_booleans/extern/carve/files.txt
Removed Paths:
-------------
branches/carve_booleans/extern/carve/include/carve/xcode_config.h
Modified: branches/carve_booleans/build_files/scons/tools/btools.py
===================================================================
--- branches/carve_booleans/build_files/scons/tools/btools.py 2011-12-14
09:53:25 UTC (rev 42627)
+++ branches/carve_booleans/build_files/scons/tools/btools.py 2011-12-14
10:29:41 UTC (rev 42628)
@@ -518,7 +518,7 @@
(BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression',
True)),
(BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache
compression', True)),
- (BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean
operations', False)),
+ (BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean
operations', True)),
(BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion
library', True)),
Modified: branches/carve_booleans/extern/carve/CMakeLists.txt
===================================================================
--- branches/carve_booleans/extern/carve/CMakeLists.txt 2011-12-14 09:53:25 UTC
(rev 42627)
+++ branches/carve_booleans/extern/carve/CMakeLists.txt 2011-12-14 10:29:41 UTC
(rev 42628)
@@ -114,7 +114,6 @@
include/carve/edge_impl.hpp
include/carve/tag.hpp
include/carve/tree.hpp
- include/carve/xcode_config.h
include/carve/heap.hpp
include/carve/matrix.hpp
include/carve/poly.hpp
Modified: branches/carve_booleans/extern/carve/files.txt
===================================================================
--- branches/carve_booleans/extern/carve/files.txt 2011-12-14 09:53:25 UTC
(rev 42627)
+++ branches/carve_booleans/extern/carve/files.txt 2011-12-14 10:29:41 UTC
(rev 42628)
@@ -45,7 +45,6 @@
include/carve/edge_impl.hpp
include/carve/tag.hpp
include/carve/tree.hpp
-include/carve/xcode_config.h
include/carve/heap.hpp
include/carve/matrix.hpp
include/carve/poly.hpp
Deleted: branches/carve_booleans/extern/carve/include/carve/xcode_config.h
===================================================================
--- branches/carve_booleans/extern/carve/include/carve/xcode_config.h
2011-12-14 09:53:25 UTC (rev 42627)
+++ branches/carve_booleans/extern/carve/include/carve/xcode_config.h
2011-12-14 10:29:41 UTC (rev 42628)
@@ -1,15 +0,0 @@
-#pragma once
-
-/* Define if using gnu libstdc++. */
-#define HAVE_LIBSTDCPP_UNORDERED_COLLECTIONS
-
-/* Define if using boost collections. */
-/* #define HAVE_BOOST_UNORDERED_COLLECTIONS */
-
-/* Define if std::unordered_map and std::unordered_set are supported by your
- compiler. */
-/* #undef HAVE_STD_UNORDERED_COLLECTIONS */
-
-/* Define if TR1 collections are supportted by your compiler. */
-/* #undef HAVE_TR1_UNORDERED_COLLECTIONS */
-
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
