Scons files for Boolop

also a fix in BOP_Material so that MSVC won't complain about template issues

diff --git a/intern/SConscript b/intern/SConscript
index a9f8196e23e1c882fea8a402e9f89dc6736c0928..ec6a61f6c71da1dc8de5f807d357cfd96ea87ba8 100644 (file)
--- a/intern/SConscript
+++ b/intern/SConscript
@@ -9,6 +9,7 @@ SConscript(['SoundSystem/SConscript',
             'memutil/SConscript/',
             'decimation/SConscript',
             'iksolver/SConscript',
+            'boolop/SConscript',
             'elbeem/SConscript',
             'opennl/SConscript'])
 

diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript
new file mode 100644 (file)
index 0000000..87ee4ea
--- /dev/null
+++ b/intern/boolop/SConscript
@@ -0,0 +1,34 @@
+#!/usr/bin/python
+Import ('user_options_dict')
+Import ('library_env')
+
+bop_env = library_env.Copy ()
+
+source_files = [
+               'intern/BOP_BBox.cpp',
+               'intern/BOP_BSPNode.cpp',
+               'intern/BOP_BSPTree.cpp',
+               'intern/BOP_Edge.cpp',
+               'intern/BOP_Face.cpp',
+               'intern/BOP_Face2Face.cpp',
+               'intern/BOP_Interface.cpp',
+               'intern/BOP_Material.cpp',
+               'intern/BOP_MaterialContainer.cpp',
+               'intern/BOP_MathUtils.cpp',
+               'intern/BOP_Merge.cpp',
+               'intern/BOP_Mesh.cpp',
+               'intern/BOP_Segment.cpp',
+               'intern/BOP_Splitter.cpp',
+               'intern/BOP_Tag.cpp',
+               'intern/BOP_Triangulator.cpp',
+               'intern/BOP_Vertex.cpp'
+               ]
+
+bop_env.Append (CPPPATH = [    '.',
+                                                       'intern',
+                                                       'extern',
+                                                       '#intern/moto/include',
+                                                       '#intern/container',
+                                                       '#intern/memutil'])
+
+bop_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_BOP', source=source_files)

diff --git a/intern/boolop/intern/BOP_Material.cpp b/intern/boolop/intern/BOP_Material.cpp
index 2d1e747eb49dc9a5ac8a292c39a7c188a9bb5e02..96f24f11cdba1b16e2d1c3c9e4dda080f5055a74 100644 (file)
--- a/intern/boolop/intern/BOP_Material.cpp
+++ b/intern/boolop/intern/BOP_Material.cpp
@@ -117,7 +117,7 @@ void BOP_Material::duplicate(const BOP_Material& other)
 /**
  * Implements operator =
  */
-BOP_Material& BOP_Material::operator = (BOP_Material& other)
+BOP_Material& BOP_Material::operator = (const BOP_Material& other)
 {
        if (other.getFaceWidth() == m_faceWidth && other.getFaceVertexWidth() == m_faceVertexWidth)
                duplicate(other);

diff --git a/intern/boolop/intern/BOP_Material.h b/intern/boolop/intern/BOP_Material.h
index a057384bf0103768e90d431549f5380a73575b37..079cc614410372385bcb66ab143fdebf3915a530 100644 (file)
--- a/intern/boolop/intern/BOP_Material.h
+++ b/intern/boolop/intern/BOP_Material.h
@@ -55,7 +55,7 @@ public:
        void setFaceVertexMaterial(char* faceVertexMaterial);
        void setFaceVertexMaterial(char* faceVertexMaterial, int i);
        void duplicate(const BOP_Material& other);
-       BOP_Material& operator = (BOP_Material& other);
+       BOP_Material& operator = (const BOP_Material& other);
        char* getFaceMaterial() const;
        char* getFaceVertexMaterial(int i) const;
        int getFaceWidth() const { return m_faceWidth; };

diff --git a/tools/scons/bs/bs_libs.py b/tools/scons/bs/bs_libs.py
index 3a818027d1d77e112d71ea8bc880d574a21a84ef..9868677fc0ad5784bef0cce6de9f0dc619d91e72 100644 (file)
--- a/tools/scons/bs/bs_libs.py
+++ b/tools/scons/bs/bs_libs.py
@@ -14,6 +14,7 @@ def common_libs(env):
        env.Append (LIBS=[
                'blender_readblenfile',
                'blender_img',
+               'blender_bop',
                'blender_blenkernel',
                'blender_blenloader',
                'blender_blenpluginapi',