Author: eudoxos
Date: 2009-07-28 08:43:19 +0200 (Tue, 28 Jul 2009)
New Revision: 1893
Modified:
trunk/lib/SConscript
trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.hpp
trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.hpp
trunk/pkg/fem/PreProcessor/FEMBeam.cpp
Log:
1. Fix monolithic compilation even with fem. All modules can now be compiled
that way.
Modified: trunk/lib/SConscript
===================================================================
--- trunk/lib/SConscript 2009-07-28 06:23:39 UTC (rev 1892)
+++ trunk/lib/SConscript 2009-07-28 06:43:19 UTC (rev 1893)
@@ -50,15 +50,15 @@
CPPPATH=env['CPPPATH']+['${TARGET.dir}'],
)
if 'YADE_OPENGL' in env['CPPDEFINES']:
-
yadeStaticOrSharedLib('yade-opengl',['opengl/FpsTracker.cpp','opengl/GLTextLabel.cpp','opengl/GLWindow.cpp','opengl/GLWindowsManager.cpp','opengl/GLUtils.cpp'],LIBS=env['LIBS']+['glut','$QGLVIEWER_LIB']),
+
yadeStaticOrSharedLib('yade-opengl',env.Combine('yade-opengl.cpp',['opengl/FpsTracker.cpp','opengl/GLTextLabel.cpp','opengl/GLWindow.cpp','opengl/GLWindowsManager.cpp','opengl/GLUtils.cpp']),LIBS=env['LIBS']+['glut','$QGLVIEWER_LIB']),
-yadeStaticOrSharedLib('yade-support',[
+yadeStaticOrSharedLib('yade-support',env.Combine('yade-support.cpp',[
'base/yadeWm3Extra.cpp',
'computational-geometry/Distances2D.cpp','computational-geometry/Distances3D.cpp','computational-geometry/Intersections2D.cpp','computational-geometry/Intersections3D.cpp','computational-geometry/MarchingCube.cpp',
'factory/ClassFactory.cpp','factory/DynLibManager.cpp','factory/FactoryExceptions.cpp',
'multimethods/Indexable.cpp','multimethods/MultiMethodsExceptions.cpp',
'serialization-xml/XMLFormatManager.cpp','serialization-xml/XMLSaxParser.cpp','serialization/Archive.cpp',
-
'serialization/IOFormatManager.cpp','serialization/IOManagerExceptions.cpp','serialization/FormatChecker.cpp','serialization/Serializable.cpp','serialization/SerializableSingleton.cpp','serialization/SerializationExceptions.cpp'])
+
'serialization/IOFormatManager.cpp','serialization/IOManagerExceptions.cpp','serialization/FormatChecker.cpp','serialization/Serializable.cpp','serialization/SerializableSingleton.cpp','serialization/SerializationExceptions.cpp']))
#######################
###### 3rd party libs
Modified: trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.hpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.hpp
2009-07-28 06:23:39 UTC (rev 1892)
+++ trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.hpp
2009-07-28 06:43:19 UTC (rev 1893)
@@ -12,7 +12,6 @@
#include<yade/core/MetaBody.hpp>
#include<yade/lib-base/yadeWm3.hpp>
-#define TR {if (Omega::instance().getCurrentIteration()%100==0) TRACE; }
class MetaBody;
class PhysicalParameters;
Modified: trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.hpp
===================================================================
--- trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.hpp
2009-07-28 06:23:39 UTC (rev 1892)
+++ trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.hpp
2009-07-28 06:43:19 UTC (rev 1893)
@@ -11,7 +11,7 @@
#include<yade/core/MetaBody.hpp>
#include<yade/pkg-common/RigidBodyParameters.hpp>
-#include <boost/numeric/ublas/matrix.hpp>
+#include<boost/numeric/ublas/matrix.hpp>
#include <vector>
Modified: trunk/pkg/fem/PreProcessor/FEMBeam.cpp
===================================================================
--- trunk/pkg/fem/PreProcessor/FEMBeam.cpp 2009-07-28 06:23:39 UTC (rev
1892)
+++ trunk/pkg/fem/PreProcessor/FEMBeam.cpp 2009-07-28 06:43:19 UTC (rev
1893)
@@ -7,7 +7,7 @@
* GNU General Public License v2 or later. See file LICENSE for details. *
*************************************************************************/
-#include "FEMBeam.hpp"
+#include"FEMBeam.hpp"
#include<yade/pkg-fem/FEMSetParameters.hpp>
#include<yade/pkg-fem/FEMTetrahedronData.hpp>
@@ -238,4 +238,4 @@
}
-YADE_PLUGIN("FEMBeam");
\ No newline at end of file
+YADE_PLUGIN("FEMBeam");
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
