+ remove Makefile.am, remove some leftovers, avoid including unneeded headers in GCS.cpp

This commit is contained in:
wmayer 2014-12-20 14:06:54 +01:00
parent d486f3351d
commit 6af1186d27
3 changed files with 2 additions and 316 deletions

View File

@ -1,309 +0,0 @@
lib_LTLIBRARIES=libPart.la Part.la
BUILT_SOURCES=\
ArcPy.cpp \
ArcOfCirclePy.cpp \
ArcOfEllipsePy.cpp \
BRepOffsetAPI_MakePipeShellPy.cpp \
CirclePy.cpp \
EllipsePy.cpp \
HyperbolaPy.cpp \
ParabolaPy.cpp \
OffsetCurvePy.cpp \
GeometryPy.cpp \
GeometryCurvePy.cpp \
GeometrySurfacePy.cpp \
LinePy.cpp \
PointPy.cpp \
BezierCurvePy.cpp \
BSplineCurvePy.cpp \
PlanePy.cpp \
ConePy.cpp \
CylinderPy.cpp \
SpherePy.cpp \
ToroidPy.cpp \
BezierSurfacePy.cpp \
BSplineSurfacePy.cpp \
OffsetSurfacePy.cpp \
RectangularTrimmedSurfacePy.cpp \
SurfaceOfExtrusionPy.cpp \
SurfaceOfRevolutionPy.cpp \
PartFeaturePy.cpp \
FeaturePythonPy.cpp \
Part2DObjectPy.cpp \
TopoShapeCompoundPy.cpp \
TopoShapeCompSolidPy.cpp \
TopoShapeEdgePy.cpp \
TopoShapeFacePy.cpp \
TopoShapeShellPy.cpp \
TopoShapeSolidPy.cpp \
TopoShapeVertexPy.cpp \
TopoShapeWirePy.cpp \
TopoShapePy.cpp
libPart_la_BUILT=\
ArcPy.h \
ArcOfCirclePy.h \
ArcOfEllipsePy.h \
BRepOffsetAPI_MakePipeShellPy.h \
CirclePy.h \
EllipsePy.h \
HyperbolaPy.h \
ParabolaPy.h \
OffsetCurvePy.h \
GeometryPy.h \
GeometryCurvePy.h \
GeometrySurfacePy.h \
LinePy.h \
PointPy.h \
BezierCurvePy.h \
BSplineCurvePy.h \
PlanePy.h \
ConePy.h \
CylinderPy.h \
SpherePy.h \
ToroidPy.h \
BezierSurfacePy.h \
BSplineSurfacePy.h \
OffsetSurfacePy.h \
RectangularTrimmedSurfacePy.h \
SurfaceOfExtrusionPy.h \
SurfaceOfRevolutionPy.h \
PartFeaturePy.h \
FeaturePythonPy.h \
Part2DObjectPy.h \
TopoShapeCompoundPy.h \
TopoShapeCompSolidPy.h \
TopoShapeEdgePy.h \
TopoShapeFacePy.h \
TopoShapeShellPy.h \
TopoShapeSolidPy.h \
TopoShapeVertexPy.h \
TopoShapeWirePy.h \
TopoShapePy.h
libPart_la_SOURCES=\
AppPartPy.cpp \
ArcPyImp.cpp \
ArcOfCirclePyImp.cpp \
ArcOfEllipsePyImp.cpp \
BRepOffsetAPI_MakePipeShellPyImp.cpp \
CirclePyImp.cpp \
CrossSection.cpp \
EllipsePyImp.cpp \
HyperbolaPyImp.cpp \
ParabolaPyImp.cpp \
OffsetCurvePyImp.cpp \
GeometryPyImp.cpp \
GeometryCurvePyImp.cpp \
GeometrySurfacePyImp.cpp \
LinePyImp.cpp \
PointPyImp.cpp \
BezierCurvePyImp.cpp \
BSplineCurvePyImp.cpp \
PlanePyImp.cpp \
ConePyImp.cpp \
CylinderPyImp.cpp \
SpherePyImp.cpp \
ToroidPyImp.cpp \
BezierSurfacePyImp.cpp \
BSplineSurfacePyImp.cpp \
OffsetSurfacePyImp.cpp \
RectangularTrimmedSurfacePyImp.cpp \
SurfaceOfExtrusionPyImp.cpp \
SurfaceOfRevolutionPyImp.cpp \
edgecluster.cpp \
FeaturePartBoolean.cpp \
FeaturePartBox.cpp \
FeaturePartCircle.cpp \
FeaturePartCurveNet.cpp \
FeaturePartCommon.cpp \
FeaturePartCut.cpp \
FeaturePartFuse.cpp \
FeaturePartImportBrep.cpp \
FeaturePartImportIges.cpp \
FeaturePartImportStep.cpp \
FeaturePartPolygon.cpp \
FeaturePartSection.cpp \
FeatureChamfer.cpp \
FeatureExtrusion.cpp \
FeatureFillet.cpp \
FeatureGeometrySet.cpp \
FeatureRevolution.cpp \
FeatureMirroring.cpp \
PartFeatures.cpp \
Geometry.cpp \
ImportIges.cpp \
ImportStep.cpp \
modelRefine.cpp \
CustomFeature.cpp \
PartFeature.cpp \
PartFeatureReference.cpp \
PartFeaturePyImp.cpp \
FeaturePythonPyImp.cpp \
Part2DObject.cpp \
Part2DObjectPyImp.cpp \
PreCompiled.cpp \
PreCompiled.h \
PrimitiveFeature.cpp \
ProgressIndicator.cpp \
PropertyGeometryList.cpp \
PropertyTopoShape.cpp \
TopoShape.cpp \
TopoShapeCompoundPyImp.cpp \
TopoShapeCompSolidPyImp.cpp \
TopoShapeEdgePyImp.cpp \
TopoShapeFacePyImp.cpp \
TopoShapeShellPyImp.cpp \
TopoShapeSolidPyImp.cpp \
TopoShapeVertexPyImp.cpp \
TopoShapeWirePyImp.cpp \
TopoShapePyImp.cpp
nodist_include_HEADERS=\
$(libPart_la_BUILT)
include_HEADERS=\
CrossSection.h \
edgecluster.h \
FeaturePartBoolean.h \
FeaturePartBox.h \
FeaturePartCircle.h \
FeaturePartCurveNet.h \
FeaturePartCommon.h \
FeaturePartCut.h \
FeaturePartFuse.h \
FeaturePartImportBrep.h \
FeaturePartImportIges.h \
FeaturePartImportStep.h \
FeaturePartPolygon.h \
FeaturePartSection.h \
FeatureChamfer.h \
FeatureExtrusion.h \
FeatureFillet.h \
FeatureGeometrySet.h \
FeatureRevolution.h \
FeatureMirroring.h \
PartFeatures.h \
Geometry.h \
ImportIges.h \
ImportStep.h \
modelRefine.h \
PartFeature.h \
PartFeatureReference.h \
CustomFeature.h \
Part2DObject.h \
PrimitiveFeature.h \
ProgressIndicator.h \
PropertyGeometryList.h \
PropertyTopoShape.h \
Tools.h \
TopoShape.h
# the library search path.
libPart_la_LDFLAGS = -L../../../Base -L../../../App -L/usr/X11R6/lib -L$(OCC_LIB) $(all_libraries) \
-version-info @LIB_CURRENT@:@LIB_REVISION@:@LIB_AGE@
libPart_la_CPPFLAGS = -DPartExport=
libPart_la_LIBADD = \
@BOOST_FILESYSTEM_LIB@ @BOOST_SYSTEM_LIB@ \
-l@PYTHON_LIB@ \
-lxerces-c \
-lFreeCADBase \
-lFreeCADApp \
-lTKernel \
-lTKFillet \
-lTKG2d \
-lTKG3d \
-lTKMath \
-lTKMesh \
-lTKSTEP \
-lTKSTEPAttr \
-lTKSTEPBase \
-lTKIGES \
-lTKSTL \
-lTKShHealing \
-lTKXSBase \
-lTKBool \
-lTKBO \
-lTKBRep \
-lTKTopAlgo \
-lTKGeomAlgo \
-lTKGeomBase \
-lTKOffset \
-lTKPrim
%.cpp: %.xml $(top_srcdir)/src/Tools/generateTemplates/templateClassPyExport.py
$(PYTHON) $(top_srcdir)/src/Tools/generate.py --outputPath $(@D) $<
#--------------------------------------------------------------------------------------
# Loader of libPart
Part_la_SOURCES=\
AppPart.cpp
# the library search path.
Part_la_LDFLAGS = $(libPart_la_LDFLAGS) -module -avoid-version
Part_la_CPPFLAGS = $(libPart_la_CPPFLAGS)
Part_la_LIBADD = \
$(libPart_la_LIBADD) \
-lPart
Part_la_DEPENDENCIES = libPart.la
#--------------------------------------------------------------------------------------
# set the include path found by configure
AM_CXXFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src $(all_includes) -I$(OCC_INC)
includedir = @includedir@/Mod/Part/App
libdir = $(prefix)/Mod/Part
CLEANFILES = $(BUILT_SOURCES) $(libPart_la_BUILT)
EXTRA_DIST = \
OpenCascadeAll.h \
ArcPy.xml \
ArcOfCirclePy.xml \
ArcOfEllipsePy.xml \
BRepOffsetAPI_MakePipeShellPy.xml \
CirclePy.xml \
EllipsePy.xml \
HyperbolaPy.xml \
ParabolaPy.xml \
OffsetCurvePy.xml \
GeometryPy.xml \
GeometryCurvePy.xml \
GeometrySurfacePy.xml \
LinePy.xml \
PointPy.xml \
BezierCurvePy.xml \
BSplineCurvePy.xml \
PlanePy.xml \
ConePy.xml \
CylinderPy.xml \
SpherePy.xml \
ToroidPy.xml \
BezierSurfacePy.xml \
BSplineSurfacePy.xml \
OffsetSurfacePy.xml \
RectangularTrimmedSurfacePy.xml \
SurfaceOfExtrusionPy.xml \
SurfaceOfRevolutionPy.xml \
PartFeaturePy.xml \
FeaturePythonPy.xml \
Part2DObjectPy.xml \
TopoShapePy.xml \
TopoShapeCompSolidPy.xml \
TopoShapeCompoundPy.xml \
TopoShapeEdgePy.xml \
TopoShapeFacePy.xml \
TopoShapeShellPy.xml \
TopoShapeSolidPy.xml \
TopoShapeVertexPy.xml \
TopoShapeWirePy.xml \
CMakeLists.txt

View File

@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (c) J<EFBFBD>rgen Riegel (juergen.riegel@web.de) 2008 *
* Copyright (c) Juergen Riegel (juergen.riegel@web.de) 2008 *
* *
* This file is part of the FreeCAD CAx development system. *
* *
@ -47,7 +47,6 @@ public:
Part ::PropertyGeometryList Geometry;
Sketcher::PropertyConstraintList Constraints;
App ::PropertyLinkSubList ExternalGeometry;
const char* ss;
/** @name methods overide Feature */
//@{
/// recalculate the Feature
@ -163,7 +162,6 @@ public:
virtual int getAxisCount(void) const;
/// retrieves an axis iterating through the construction lines of the sketch (indices start at 0)
virtual Base::Axis getAxis(int axId) const;
const char*& it(int arg1, int arg2);
protected:
/// get called by the container when a property has changed

View File

@ -31,10 +31,7 @@
#undef _GCS_DEBUG_SOLVER_JACOBIAN_QR_DECOMPOSITION_TRIANGULAR_MATRIX
#if defined(_GCS_DEBUG) || defined(_GCS_DEBUG_SOLVER_JACOBIAN_QR_DECOMPOSITION_TRIANGULAR_MATRIX)
#include <Base/Writer.h>
#include <Base/Reader.h>
#include <Base/Exception.h>
#include <Base/TimeInfo.h>
#include <FCConfig.h>
#include <Base/Console.h>
#endif // _GCS_DEBUG