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

corrections for MIPS IRIX... and for the demo Makefile.

This commit is contained in:
Tran Kai Frank Da 1999-12-14 15:18:46 +00:00
parent e4c39a79c0
commit 47f05b90cd
9 changed files with 91 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Packages/Alpha_shapes_2/demo/Alpha_shapes_2/makefile
View File

@ -14,32 +14,36 @@ include $(CGAL_MAKEFILE)
# rajouter CGAL_LOCAL_CXXFLAGS si on veut les packages de Local
CXXFLAGS = $(CGAL_CXXFLAGS) \
$(LONG_NAME_PROBLEM_CXXFLAGS)
# -DDEBUG for display additionnal info
# -O2 supported
# -O2 supported iff long names are not a problem (on Linux, or with
# the gnu "binutils")
#---------------------------------------------------------------------#
# linker flags
#---------------------------------------------------------------------#
LDFLAGS = $(CGAL_WINDOW_LIBPATH) \
$(CGAL_WINDOW_LDFLAGS)
LIBPATH = $(CGAL_LIBPATH)
LDFLAGS = $(CGAL_WINDOW_LDFLAGS) \
$(LONG_NAME_PROBLEM_LDFLAGS)
#---------------------------------------------------------------------#
# target entries
#---------------------------------------------------------------------#
all: demo_alpha demo_weight
all: demo_alpha$(EXE_EXT) demo_weight$(EXE_EXT)
demo_alpha: demo_alpha$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT) -o demo_alpha demo_alpha$(OBJ_EXT) $(CGAL_WINDOW_LDFLAGS)
demo_alpha$(EXE_EXT): demo_alpha$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_alpha demo_alpha$(OBJ_EXT) $(LDFLAGS)
demo_weight: demo_weight$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT) -o demo_weight demo_weight$(OBJ_EXT) $(CGAL_WINDOW_LDFLAGS)
demo_weight$(EXE_EXT): demo_weight$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)demo_weight demo_weight$(OBJ_EXT) $(LDFLAGS)
clean:
\rm -f *.o *.obj *.exe \
demo_alpha demo_weight \
demo_alpha$(EXE_EXT) demo_weight$(EXE_EXT) \
core
@ -48,7 +52,7 @@ clean:
#---------------------------------------------------------------------#
.C$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) -c $<
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<

22
Packages/Alpha_shapes_2/examples/Alpha_shapes_2/Makefile
View File

@ -41,32 +41,34 @@ CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \
#---------------------------------------------------------------------#
# linker flags
#---------------------------------------------------------------------#
LDFLAGS = $(CGAL_WINDOW_LIBPATH) \
$(CGAL_WINDOW_LDFLAGS)
LIBPATH = $(CGAL_LIBPATH)
LDFLAGS = $(CGAL_WINDOW_LDFLAGS)
#---------------------------------------------------------------------#
# target entries
#---------------------------------------------------------------------#
all: example_alpha example_weight
all: example_alpha$(EXE_EXT) example_weight$(EXE_EXT)
example_alpha: example_alpha.o
$(CGAL_CXX) -o example_alpha example_alpha.o $(LDFLAGS)
example_alpha$(EXE_EXT): example_alpha$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)example_alpha example_alpha$(OBJ_EXT) $(LDFLAGS)
example_weight: example_weight.o
$(CGAL_CXX) -o example_weight example_weight.o $(LDFLAGS)
example_weight$(EXE_EXT): example_weight$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)example_weight example_weight$(OBJ_EXT) $(LDFLAGS)
clean:
\rm -f *.o *.obj *.exe \
example_alpha example_weight \
example_alpha$(EXE_EXT) example_weight$(EXE_EXT) \
core
#---------------------------------------------------------------------#
# suffix rules
#---------------------------------------------------------------------#
.C.o:
$(CGAL_CXX) $(CXXFLAGS) -c $<
.C$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<

14
Packages/Alpha_shapes_2/examples/Alpha_shapes_2/example_alpha.C
View File

@ -28,9 +28,19 @@ correspondant a l'Alpha Shape.
#include <CGAL/Delaunay_triangulation_2.h>
#include <CGAL/Alpha_shape_2.h>
//Choose the better number type as possible
#ifdef CGAL_USE_LEDA
#include <CGAL/leda_integer.h>
typedef leda_integer coord_type;
#else//CGAL_USE_LEDA
#ifdef CGAL_USE_GMP
#include <CGAL/Gmpz.h>
typedef CGAL::Gmpz coord_type;
#else//CGAL_USE_GMP
#include <CGAL/double.h>
typedef double coord_type;
#endif//CGAL_USE_GMP
#endif//CGAL_USE_LEDA
typedef CGAL::Cartesian<coord_type> CRep;

14
Packages/Alpha_shapes_2/examples/Alpha_shapes_2/example_weight.C
View File

@ -31,7 +31,19 @@ correspondant a l'Alpha Shape ponderee.
#include <CGAL/Regular_triangulation_2.h>
#include <CGAL/Alpha_shape_2.h>
typedef int coord_type;
//Choose the better number type as possible
#ifdef CGAL_USE_LEDA
#include <CGAL/leda_integer.h>
typedef leda_integer coord_type;
#else//CGAL_USE_LEDA
#ifdef CGAL_USE_GMP
#include <CGAL/Gmpz.h>
typedef CGAL::Gmpz coord_type;
#else//CGAL_USE_GMP
#include <CGAL/double.h>
typedef double coord_type;
#endif//CGAL_USE_GMP
#endif//CGAL_USE_LEDA
typedef CGAL::Cartesian<coord_type> CRep;
typedef CGAL::Point_2<CRep> Point_base;

4
Packages/Alpha_shapes_2/include/CGAL/predicates/in_smallest_orthogonalcircle_ftC2.h
View File

@ -45,8 +45,8 @@ in_smallest_orthogonalcircleC2(const FT &px, const FT &py, const FT &pw,
FT dty = ty-qy;
FT dpz = square(dpx)+square(dpy);
return Bounded_side (sign(-(square(dtx)+square(dty)-tw+qw)*dpz
+(dpz-pw+qw)*(dpx*dtx+dpy*dty)));
return Bounded_side (sign<FT>(-(square(dtx)+square(dty)-tw+qw)*dpz
+(dpz-pw+qw)*(dpx*dtx+dpy*dty)));
}
//-------------------------------------------------------------------

22
Packages/Alpha_shapes_2/test/Alpha_shapes_2/Makefile
View File

@ -41,32 +41,34 @@ CXXFLAGS = -I$(HOME)/Cgal-2.0/To_submit/Alpha_shapes_2/include \
#---------------------------------------------------------------------#
# linker flags
#---------------------------------------------------------------------#
LDFLAGS = $(CGAL_WINDOW_LIBPATH) \
$(CGAL_WINDOW_LDFLAGS)
LIBPATH = $(CGAL_LIBPATH)
LDFLAGS = $(CGAL_WINDOW_LDFLAGS)
#---------------------------------------------------------------------#
# target entries
#---------------------------------------------------------------------#
all: test_alpha test_weight
all: test_alpha$(EXE_EXT) test_weight$(EXE_EXT)
test_alpha: test_alpha.o
$(CGAL_CXX) -o test_alpha test_alpha.o $(LDFLAGS)
test_alpha$(EXE_EXT): test_alpha$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_alpha test_alpha$(OBJ_EXT) $(LDFLAGS)
test_weight: test_weight.o
$(CGAL_CXX) -o test_weight test_weight.o $(LDFLAGS)
test_weight$(EXE_EXT): test_weight$(OBJ_EXT)
$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_weight test_weight$(OBJ_EXT) $(LDFLAGS)
clean:
\rm -f *.o *.obj *.exe \
test_alpha test_weight \
test_alpha$(EXE_EXT) test_weight$(EXE_EXT) \
core
#---------------------------------------------------------------------#
# suffix rules
#---------------------------------------------------------------------#
.C.o:
$(CGAL_CXX) $(CXXFLAGS) -c $<
.C$(OBJ_EXT):
$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<

14
Packages/Alpha_shapes_2/test/Alpha_shapes_2/test_alpha.C
View File

@ -28,9 +28,19 @@ correspondant a l'Alpha Shape.
#include <CGAL/Delaunay_triangulation_2.h>
#include <CGAL/Alpha_shape_2.h>
//Choose the better number type as possible
#ifdef CGAL_USE_LEDA
#include <CGAL/leda_integer.h>
typedef leda_integer coord_type;
#else//CGAL_USE_LEDA
#ifdef CGAL_USE_GMP
#include <CGAL/Gmpz.h>
typedef CGAL::Gmpz coord_type;
#else//CGAL_USE_GMP
#include <CGAL/double.h>
typedef double coord_type;
#endif//CGAL_USE_GMP
#endif//CGAL_USE_LEDA
typedef CGAL::Cartesian<coord_type> CRep;

14
Packages/Alpha_shapes_2/test/Alpha_shapes_2/test_weight.C
View File

@ -31,7 +31,19 @@ correspondant a l'Alpha Shape ponderee.
#include <CGAL/Regular_triangulation_2.h>
#include <CGAL/Alpha_shape_2.h>
typedef int coord_type;
//Choose the better number type as possible
#ifdef CGAL_USE_LEDA
#include <CGAL/leda_integer.h>
typedef leda_integer coord_type;
#else//CGAL_USE_LEDA
#ifdef CGAL_USE_GMP
#include <CGAL/Gmpz.h>
typedef CGAL::Gmpz coord_type;
#else//CGAL_USE_GMP
#include <CGAL/double.h>
typedef double coord_type;
#endif//CGAL_USE_GMP
#endif//CGAL_USE_LEDA
typedef CGAL::Cartesian<coord_type> CRep;
typedef CGAL::Point_2<CRep> Point_base;

2
Packages/Alpha_shapes_2/version
View File

@ -1 +1 @@
4.2 ( 8 Dec 1999)
4.5 (14 Dec 1999)