[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32559] trunk/blender: enable DEBUG define in CMake and scons, also change booleans debug option to BOP_DEBUG, which was used inconsistently, and had to add a define for superlu.
Campbell Barton
ideasman42 at gmail.com
Mon Oct 18 13:21:22 CEST 2010
Revision: 32559
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32559
Author: campbellbarton
Date: 2010-10-18 13:21:22 +0200 (Mon, 18 Oct 2010)
Log Message:
-----------
enable DEBUG define in CMake and scons, also change booleans debug option to BOP_DEBUG, which was used inconsistently, and had to add a define for superlu.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/scons/config/darwin-config.py
trunk/blender/build_files/scons/config/freebsd7-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/freebsd9-config.py
trunk/blender/build_files/scons/config/linux2-config.py
trunk/blender/build_files/scons/config/linuxcross-config.py
trunk/blender/build_files/scons/config/openbsd3-config.py
trunk/blender/build_files/scons/config/sunos5-config.py
trunk/blender/build_files/scons/config/win32-mingw-config.py
trunk/blender/intern/boolop/intern/BOP_Interface.cpp
trunk/blender/intern/boolop/intern/BOP_Merge2.cpp
trunk/blender/intern/opennl/superlu/ssp_defs.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenlib/BLI_math_matrix.h
trunk/blender/source/blender/blenlib/intern/math_matrix.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/CMakeLists.txt 2010-10-18 11:21:22 UTC (rev 32559)
@@ -313,6 +313,8 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
@@ -550,10 +552,9 @@
ADD_DEFINITIONS(-DFREE_WINDOWS)
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DDEBUG")
-
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
@@ -796,6 +797,9 @@
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
+
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA ${LIBDIR}/opencollada)
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/darwin-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -340,7 +340,7 @@
BF_PROFILE = False
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
#############################################################################
################### Output directories ##################
Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -204,7 +204,7 @@
BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
BF_BUILDDIR = '../build/freebsd7'
BF_INSTALLDIR='../install/freebsd7'
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -204,7 +204,7 @@
BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
BF_BUILDDIR = '../build/freebsd8'
BF_INSTALLDIR='../install/freebsd8'
Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -204,7 +204,7 @@
BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
BF_BUILDDIR = '../build/freebsd9'
BF_INSTALLDIR='../install/freebsd9'
Modified: trunk/blender/build_files/scons/config/linux2-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux2-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/linux2-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -220,7 +220,7 @@
BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2'
Modified: trunk/blender/build_files/scons/config/linuxcross-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linuxcross-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/linuxcross-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -185,7 +185,7 @@
LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++', '-luuid', '-lole32'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
BF_PROFILE = False
BF_PROFILE_CCFLAGS = ['-pg','-g']
Modified: trunk/blender/build_files/scons/config/openbsd3-config.py
===================================================================
--- trunk/blender/build_files/scons/config/openbsd3-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/openbsd3-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -147,7 +147,7 @@
BF_PROFILE_LINKFLAGS = ['-pg']
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = ['-g']
+BF_DEBUG_CCFLAGS = ['-g', '-DDEBUG']
BF_BUILDDIR='../build/openbsd3'
BF_INSTALLDIR='../install/openbsd3'
Modified: trunk/blender/build_files/scons/config/sunos5-config.py
===================================================================
--- trunk/blender/build_files/scons/config/sunos5-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/sunos5-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -161,7 +161,7 @@
BF_PROFILE = False
BF_DEBUG = False
-BF_DEBUG_CCFLAGS = []
+BF_DEBUG_CCFLAGS = ['-DDEBUG']
BF_BUILDDIR = '../build/sunos5'
BF_INSTALLDIR='../install/sunos5'
Modified: trunk/blender/build_files/scons/config/win32-mingw-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-mingw-config.py 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/build_files/scons/config/win32-mingw-config.py 2010-10-18 11:21:22 UTC (rev 32559)
@@ -176,7 +176,7 @@
LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid']
BF_DEBUG = False
-BF_DEBUG_CCFLAGS= ['-g']
+BF_DEBUG_CCFLAGS= ['-g', '-DDEBUG']
BF_PROFILE_CCFLAGS = ['-pg', '-g']
BF_PROFILE_LINKFLAGS = ['-pg']
Modified: trunk/blender/intern/boolop/intern/BOP_Interface.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Interface.cpp 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/intern/boolop/intern/BOP_Interface.cpp 2010-10-18 11:21:22 UTC (rev 32559)
@@ -80,7 +80,7 @@
CSG_FaceIteratorDescriptor obBFaces,
CSG_VertexIteratorDescriptor obBVertices)
{
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
cout << "BEGIN BOP_performBooleanOperation" << endl;
#endif
@@ -118,7 +118,7 @@
// Invert the output mesh if is required
*outputMesh = BOP_exportMesh(&meshC, invertMeshC);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
cout << "END BOP_performBooleanOperation" << endl;
#endif
@@ -141,7 +141,7 @@
bool invertMeshA,
bool invertMeshB)
{
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
BOP_Chrono chrono;
float t = 0.0f;
float c = 0.0f;
@@ -156,7 +156,7 @@
BOP_BSPTree bspB;
bspB.addMesh(meshC, *facesB);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "Create BSP " << c << endl;
#endif
@@ -172,7 +172,7 @@
if ((0.25*facesB->size()) > bspA.getDeep())
BOP_meshFilter(meshC, facesB, &bspA);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "mesh Filter " << c << endl;
#endif
@@ -180,7 +180,7 @@
// Face 2 Face
BOP_Face2Face(meshC,facesA,facesB);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "Face2Face " << c << endl;
#endif
@@ -189,7 +189,7 @@
BOP_meshClassify(meshC,facesA,&bspB);
BOP_meshClassify(meshC,facesB,&bspA);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "Classification " << c << endl;
#endif
@@ -197,7 +197,7 @@
// Process overlapped faces
BOP_removeOverlappedFaces(meshC,facesA,facesB);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "Remove overlap " << c << endl;
#endif
@@ -205,7 +205,7 @@
// Sew two meshes
BOP_sew(meshC,facesA,facesB);
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "Sew " << c << endl;
#endif
@@ -238,7 +238,7 @@
#endif
#endif
- #ifdef DEBUG
+ #ifdef BOP_DEBUG
c = chrono.stamp(); t += c;
cout << "Merge faces " << c << endl;
cout << "Total " << t << endl;
Modified: trunk/blender/intern/boolop/intern/BOP_Merge2.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Merge2.cpp 2010-10-18 10:52:57 UTC (rev 32558)
+++ trunk/blender/intern/boolop/intern/BOP_Merge2.cpp 2010-10-18 11:21:22 UTC (rev 32559)
@@ -70,7 +70,7 @@
}
if( nonmanifold )
cout << nonmanifold << " edges detected" << endl;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
cout << "---------------------------" << endl;
BOP_Edges edges = m->getEdges();
@@ -130,7 +130,7 @@
{
m_mesh = m;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
cout << "##############################" << endl;
#endif
cleanup( );
@@ -147,7 +147,7 @@
// ... and merge new faces
if( cont ) cont = mergeFaces();
-#ifdef DEBUG
+#ifdef BOP_DEBUG
cout << "called mergeFaces " << cont << endl;
#endif
// ... until the merge is not succesful
@@ -186,7 +186,7 @@
unsigned short facecount = 0;
bool found = false;
BOP_Indexs vertList;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
cout << " first edge is " << (*it) << endl;
#endif
vertList.push_back(first);
@@ -214,7 +214,7 @@
edge = NULL;
}
if( !edge ) break;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
cout << " next edge is " << edge << endl;
#endif
tmpface = m->getFace(edge->getFaces().front());
@@ -231,7 +231,7 @@
}
if(found) {
edge = *it;
-#ifdef DEBUG
+#ifdef BOP_DEBUG
cout << " --> found a loop" << endl;
#endif
if( vertList.size() == 3 ) {
@@ -241,7 +241,7 @@
BOP_Face4 *face = (BOP_Face4 *)m->getFace(edge->getFaces().front());
face->getNeighbours(first,last,next,last);
} else {
-#ifdef DEBUG
+#ifdef BOP_DEBUG
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list