From 71bbcf07dc0d522e8cf416f13d0483eb45844e93 Mon Sep 17 00:00:00 2001 From: Marc Pouget Date: Tue, 14 Mar 2006 08:54:21 +0000 Subject: [PATCH] --- Ridges_3/demo/Ridges_3/enriched_polyhedron.h | 12 ++++++-- Ridges_3/demo/Ridges_3/makefile | 31 +++++++++++++------- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/Ridges_3/demo/Ridges_3/enriched_polyhedron.h b/Ridges_3/demo/Ridges_3/enriched_polyhedron.h index c3231e5674e..4ac3f9a63db 100644 --- a/Ridges_3/demo/Ridges_3/enriched_polyhedron.h +++ b/Ridges_3/demo/Ridges_3/enriched_polyhedron.h @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////// // -// Class: Enriched_polyhedron +// Class: Enriched_polyhedron // // /////////////////////////////////////////////////////////////////////////// @@ -208,6 +208,9 @@ public : typedef typename kernel::Vector_3 Vector; typedef typename Enriched_polyhedron::Vertex_handle Vertex_handle; typedef typename Enriched_polyhedron::Facet_handle Facet_handle; + + typedef typename Enriched_polyhedron::Facet Facet; + typedef typename Enriched_polyhedron::Face_handle Face_handle; typedef typename Enriched_polyhedron::Halfedge_handle Halfedge_handle; typedef typename Enriched_polyhedron::Facet_iterator Facet_iterator; @@ -217,9 +220,12 @@ public : items>::Halfedge_iterator Halfedge_iterator; typedef typename Enriched_polyhedron::Point_iterator Point_iterator; typedef typename Enriched_polyhedron::Halfedge_around_facet_circulator Halfedge_around_facet_circulator; - typedef typename Enriched_polyhedron::Vertex_iterator Vertex_iterator; - typedef typename Enriched_polyhedron::Edge_iterator Edge_iterator ; + +typedef typename Enriched_polyhedron::Vertex_iterator Vertex_iterator; +typedef typename Enriched_polyhedron::Vertex Vertex; + +typedef typename Enriched_polyhedron::Edge_iterator Edge_iterator ; public : // life cycle diff --git a/Ridges_3/demo/Ridges_3/makefile b/Ridges_3/demo/Ridges_3/makefile index f8cb3b71ca0..c22b35caa39 100644 --- a/Ridges_3/demo/Ridges_3/makefile +++ b/Ridges_3/demo/Ridges_3/makefile @@ -6,22 +6,27 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -#perso bug in current CGAL-I! -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.4_g++-3.3.3 +#FC +#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.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) -PROFOPT= -g +PROFOPT= -g -fpermissive CFLAGS=${PROFOPT} #---------------------------------------------------------------------# # compiler flags #---------------------------------------------------------------------# 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 +#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 -GLUT_INC=-I$(GLUT_DIR)/include +#GLUT_INC=-I$(GLUT_DIR)/include CXXFLAGS = \ -I../../include \ @@ -44,7 +49,7 @@ CXXFLAGS = \ #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 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: /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/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/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/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: /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/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