Skip to content
Snippets Groups Projects
Commit 840475d1 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

- fix include for box version
- don't optmize BDS.cpp for now: it crashes with gcc 4.1 (e.g. on debian etch)
parent 9174963e
No related branches found
No related tags found
No related merge requests found
# $Id: Makefile,v 1.35 2007-03-18 14:12:20 geuzaine Exp $ # $Id: Makefile,v 1.36 2007-04-21 20:20:57 geuzaine Exp $
# #
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
# #
...@@ -23,7 +23,8 @@ include ../variables ...@@ -23,7 +23,8 @@ include ../variables
LIB = ../lib/libGmshBox.a LIB = ../lib/libGmshBox.a
INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics -I../Mesh -I../Numeric\ INCLUDE = -I../Common -I../DataStr -I../Geo -I../Graphics -I../Mesh -I../Numeric\
-I../Parser -I../Fltk -I../Plugin -I../Parallel -I../Parser -I../Fltk -I../Plugin -I../Parallel\
-I../contrib/ANN/include
CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE} CFLAGS = ${OPTIM} ${FLAGS} ${INCLUDE}
SRC = Box.cpp SRC = Box.cpp
...@@ -56,22 +57,19 @@ Box.o: Box.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \ ...@@ -56,22 +57,19 @@ Box.o: Box.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
../DataStr/List.h ../DataStr/Tree.h ../Common/OS.h ../Numeric/Numeric.h \ ../DataStr/List.h ../DataStr/Tree.h ../Common/OS.h ../Numeric/Numeric.h \
../Geo/Geo.h ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \ ../Geo/Geo.h ../Common/GmshDefines.h ../Geo/gmshSurface.h ../Geo/Pair.h \
../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \ ../Geo/Range.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/SVector3.h \
../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \ ../Geo/SBoundingBox3d.h ../DataStr/List.h ../DataStr/Tree.h \
../Geo/SPoint2.h ../Geo/ExtrudeParams.h ../Common/SmoothData.h \ ../Geo/ExtrudeParams.h ../Common/SmoothData.h ../Numeric/Numeric.h \
../Mesh/Generator.h ../Common/Views.h ../Common/ColorTable.h \ ../Mesh/Generator.h ../Parser/Parser.h ../DataStr/List.h \
../Common/VertexArray.h ../Common/SmoothData.h \ ../DataStr/Tree.h ../Common/Context.h ../Common/Options.h \
../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Parser/Parser.h \ ../Parser/OpenFile.h ../Common/CommandLine.h ../Parser/CreateFile.h \
../Common/Context.h ../Common/Options.h ../Parser/OpenFile.h \ ../Parallel/ParUtil.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
../Common/CommandLine.h ../Parser/CreateFile.h ../Parallel/ParUtil.h \ ../Common/Options.h ../Common/Message.h ../Common/Views.h \
../Plugin/PluginManager.h ../Plugin/Plugin.h ../Geo/GModel.h \ ../Common/ColorTable.h ../Common/VertexArray.h ../Common/SmoothData.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \ ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/GmshMatrix.h \
../Geo/SBoundingBox3d.h ../Geo/MVertex.h ../Geo/SPoint3.h \ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/MVertex.h \
../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \ ../Geo/GPoint.h ../Geo/GEdge.h ../Geo/MElement.h ../Geo/MEdge.h \
../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \ ../Common/Hash.h ../Geo/MFace.h ../Numeric/Numeric.h \
../Geo/MElement.h ../Geo/MVertex.h ../Geo/MEdge.h ../Geo/MVertex.h \ ../Common/Context.h ../Geo/GFace.h ../Geo/GEdgeLoop.h ../Geo/GRegion.h \
../Geo/SVector3.h ../Common/Hash.h ../Geo/MFace.h ../Geo/MVertex.h \ ../Mesh/Field.h ../Common/Views.h ../contrib/ANN/include/ANN/ANN.h \
../Geo/SVector3.h ../Geo/ExtrudeParams.h ../Geo/GFace.h ../Geo/GPoint.h \ ../Geo/Geo.h ../Geo/GEdge.h ../Common/OctreePost.h ../Common/Octree.h \
../Geo/GEntity.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/MElement.h \ ../Common/OctreeInternals.h ../Mesh/BackgroundMesh.h
../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h ../Geo/ExtrudeParams.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/MElement.h \
../Geo/ExtrudeParams.h ../Geo/SBoundingBox3d.h
# $Id: Makefile,v 1.170 2007-04-21 19:40:00 geuzaine Exp $ # $Id: Makefile,v 1.171 2007-04-21 20:20:57 geuzaine Exp $
# #
# Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
# #
...@@ -59,6 +59,10 @@ ${LIB}: ${OBJ} ...@@ -59,6 +59,10 @@ ${LIB}: ${OBJ}
.cpp.o: .cpp.o:
${CXX} ${CFLAGS} -c $< ${CXX} ${CFLAGS} -c $<
# Don't optimize BDS: it crashes with some flavors of gcc 4.1 (e.g. on debian etch)
BDS.o:
${CXX} ${FLAGS} ${INCLUDE} -c $<
clean: clean:
rm -f *.o rm -f *.o
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment