songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This commit is contained in:
Marc Pouget 2006-03-14 08:54:21 +00:00
parent 0732dbc346
commit 71bbcf07dc
2 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ridges_3/demo/Ridges_3/enriched_polyhedron.h
View File

@ -208,6 +208,9 @@ public :
typedef typename kernel::Vector_3 Vector; typedef typename kernel::Vector_3 Vector;
typedef typename Enriched_polyhedron<kernel, items>::Vertex_handle Vertex_handle; typedef typename Enriched_polyhedron<kernel, items>::Vertex_handle Vertex_handle;
typedef typename Enriched_polyhedron<kernel, items>::Facet_handle Facet_handle; typedef typename Enriched_polyhedron<kernel, items>::Facet_handle Facet_handle;
typedef typename Enriched_polyhedron<kernel, items>::Facet Facet;
typedef typename Enriched_polyhedron<kernel, items>::Face_handle Face_handle; typedef typename Enriched_polyhedron<kernel, items>::Face_handle Face_handle;
typedef typename Enriched_polyhedron<kernel, items>::Halfedge_handle Halfedge_handle; typedef typename Enriched_polyhedron<kernel, items>::Halfedge_handle Halfedge_handle;
typedef typename Enriched_polyhedron<kernel, items>::Facet_iterator Facet_iterator; typedef typename Enriched_polyhedron<kernel, items>::Facet_iterator Facet_iterator;
@ -217,9 +220,12 @@ public :
items>::Halfedge_iterator Halfedge_iterator; items>::Halfedge_iterator Halfedge_iterator;
typedef typename Enriched_polyhedron<kernel, items>::Point_iterator Point_iterator; typedef typename Enriched_polyhedron<kernel, items>::Point_iterator Point_iterator;
typedef typename Enriched_polyhedron<kernel, items>::Halfedge_around_facet_circulator Halfedge_around_facet_circulator; typedef typename Enriched_polyhedron<kernel, items>::Halfedge_around_facet_circulator Halfedge_around_facet_circulator;
typedef typename Enriched_polyhedron<kernel, items>::Vertex_iterator Vertex_iterator;
typedef typename Enriched_polyhedron<kernel, items>::Edge_iterator Edge_iterator ;
typedef typename Enriched_polyhedron<kernel, items>::Vertex_iterator Vertex_iterator;
typedef typename Enriched_polyhedron<kernel, items>::Vertex Vertex;
typedef typename Enriched_polyhedron<kernel, items>::Edge_iterator Edge_iterator ;
public : public :
// life cycle // life cycle

31
Ridges_3/demo/Ridges_3/makefile
View File

@ -6,22 +6,27 @@
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
# Choose the right include file from the <cgalroot>/make directory. # Choose the right include file from the <cgalroot>/make directory.
#perso bug in current CGAL-I! #FC
CGAL_MAKEFILE = /proj/geometrica/home/CGAL/CGAL-3.2-I-370/make/makefile_i686_Linux-2.4_g++-3.3.3 #CGAL_MAKEFILE = ${CGAL}/make/makefile_i686_Linux-2.6.11-1.35-FC3_g++-3.4.4
#MARC
#CGAL_MAKEFILE = ${CGAL}/make/makefile_i686_Linux-2.4_g++-3.3.3 #CGAL_MAKEFILE = ${CGAL}/make/makefile_i686_Linux-2.6.12-10-386_g++-4.0.2
CGAL_MAKEFILE = /home/mpouget/libs/CGAL-3.1/make/makefile_i686_Linux-2.6.12-10-386_g++-4.0.2
include $(CGAL_MAKEFILE) include $(CGAL_MAKEFILE)
PROFOPT= -g PROFOPT= -g -fpermissive
CFLAGS=${PROFOPT} CFLAGS=${PROFOPT}
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
# compiler flags # compiler flags
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
GSL_DIR=/usr/local/gsl GSL_DIR=/usr/local/gsl
GLUT_DIR=/user/sloriot/home/C/lib/glut-3.7 GLUT_DIR=/user/sloriot/home/C/lib/glut-3.7
#GLUT_DIR=/user/sloriot/home/C/lib/glut-3.7
#MARC works without GLUT_DIR!! just needs GLUT_LIBS=-lGL -lGLU -lglut -lX11 -lXmu -lXi -lm
#GLUT_DIR=/usr/local/glut-3.7
#GLUT_DIR=/home/mpouget/Desktop/glut-3.7
GSL_INC=-I$(GSL_DIR)/include GSL_INC=-I$(GSL_DIR)/include
GLUT_INC=-I$(GLUT_DIR)/include #GLUT_INC=-I$(GLUT_DIR)/include
CXXFLAGS = \ CXXFLAGS = \
-I../../include \ -I../../include \
@ -44,7 +49,7 @@ CXXFLAGS = \
#ALL_INCLUDES=${GLUT_INC} #ALL_INCLUDES=${GLUT_INC}
GLUT_LIBS_PATH=-L$(GLUT_DIR)/lib/glut -L/usr/X11R6/lib #GLUT_LIBS_PATH=-L$(GLUT_DIR)/lib/glut -L/usr/X11R6/lib
GLUT_LIBS=-lGL -lGLU -lglut -lX11 -lXmu -lXi -lm GLUT_LIBS=-lGL -lGLU -lglut -lX11 -lXmu -lXi -lm
GSL_LIBS_PATH=-L${GSL_DIR}/lib GSL_LIBS_PATH=-L${GSL_DIR}/lib
@ -95,12 +100,18 @@ depend:
ogl_visu.o: ogl_visu.h /usr/include/math.h /usr/include/features.h ogl_visu.o: ogl_visu.h /usr/include/math.h /usr/include/features.h
ogl_visu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h ogl_visu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
ogl_visu.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h ogl_visu.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h
ogl_visu.o: /usr/include/bits/mathcalls.h enriched_polyhedron.h ogl_visu.o: /usr/include/bits/mathcalls.h /usr/include/GL/glut.h
ogl_visu.o: /usr/include/GL/gl.h /usr/include/GL/glext.h
ogl_visu.o: /usr/include/GL/glu.h enriched_polyhedron.h
ogl_visu.o: /usr/include/math.h /usr/include/features.h ogl_visu.o: /usr/include/math.h /usr/include/features.h
ogl_visu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h ogl_visu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
ogl_visu.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h ogl_visu.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h
ogl_visu.o: /usr/include/bits/mathcalls.h enriched_polyhedron.h ogl_visu.o: /usr/include/bits/mathcalls.h /usr/include/GL/glut.h
ogl_visu.o: /usr/include/GL/gl.h /usr/include/GL/glext.h
ogl_visu.o: /usr/include/GL/glu.h enriched_polyhedron.h
visu.o: ogl_visu.h /usr/include/math.h /usr/include/features.h visu.o: ogl_visu.h /usr/include/math.h /usr/include/features.h
visu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h visu.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h
visu.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h visu.o: /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h
visu.o: /usr/include/bits/mathcalls.h enriched_polyhedron.h visu.o: /usr/include/bits/mathcalls.h /usr/include/GL/glut.h
visu.o: /usr/include/GL/gl.h /usr/include/GL/glext.h /usr/include/GL/glu.h
visu.o: enriched_polyhedron.h