fixed makefile to use CGAL_WINDOW_LIBPATH and CGAL_WINDOW_LDFLAGS

fixed stream_iterator.C :
add CGAL:: in front of copy_n
This commit is contained in:
Mariette Yvinec 1999-12-10 16:10:07 +00:00
parent 2cea8620df
commit 1b87d80052
2 changed files with 8 additions and 8 deletions

View File

@ -23,11 +23,11 @@ CXXFLAGS = \
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
LIBPATH = \ LIBPATH = \
$(CGAL_LIBPATH) $(CGAL_WINDOW_LIBPATH)
LDFLAGS = \ LDFLAGS = \
$(LONG_NAME_PROBLEM_LDFLAGS) \ $(LONG_NAME_PROBLEM_LDFLAGS) \
$(CGAL_LDFLAGS) $(CGAL_WINDOW_LDFLAGS)
#---------------------------------------------------------------------# #---------------------------------------------------------------------#
# target entries # target entries

View File

@ -9,14 +9,14 @@
#include <CGAL/IO/Istream_iterator.h> #include <CGAL/IO/Istream_iterator.h>
#include <CGAL/IO/Ostream_iterator.h> #include <CGAL/IO/Ostream_iterator.h>
#include <CGAL/IO/leda_window.h> #include <CGAL/IO/leda_window.h>
#include <algo> #include <algorithm>
using namespace CGAL; using namespace CGAL;
typedef Cartesian<double> TutorialR; typedef Cartesian<double> TutorialR;
typedef Point_2<TutorialR> Point; typedef Point_2<TutorialR> Point;
typedef Creator_uniform_2<double,Point_2> Creator; typedef Creator_uniform_2<double,Point> Creator;
typedef Random_points_in_disc_2<Point_2,Creator> Random_points_in_disc; typedef Random_points_in_disc_2<Point,Creator> Random_points_in_disc;
void init_window( leda_window& W) { void init_window( leda_window& W) {
cgalize( W); cgalize( W);
@ -33,7 +33,7 @@ int main()
// Use deterministic initialization for the random number generator. // Use deterministic initialization for the random number generator.
Random rnd(1); Random rnd(1);
Random_points_in_disc rnd_points( 1.0, rnd); Random_points_in_disc rnd_points( 1.0, rnd);
copy_n( rnd_points, 100, points); CGAL::copy_n( rnd_points, 100, points);
// Display points in a 512x512 pixel window. // Display points in a 512x512 pixel window.
leda_window W(512, 512); leda_window W(512, 512);