From 30b7b9a38f8d3b45a1a0f8af6d6e3dbc0a2f9c78 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Mon, 19 Apr 1999 13:26:05 +0000 Subject: [PATCH] added CGAL_EXTRA_OBJECTS to lib makefiles (Intervall_arithmetic fix for irix) --- Packages/Installation/src/makefile_lib | 6 +++--- Packages/Installation/src/makefile_sharedlib | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Packages/Installation/src/makefile_lib b/Packages/Installation/src/makefile_lib index 05984d8812d..121051c3c48 100644 --- a/Packages/Installation/src/makefile_lib +++ b/Packages/Installation/src/makefile_lib @@ -26,6 +26,7 @@ CXXFLAGS = $(CGAL_LIB_CXXFLAGS) \ CGAL_OBJECTS = \ Bbox_2.o \ Bbox_2_intersections.o \ +Color.o \ Double.o \ Double_eps.o \ File_header_OFF.o \ @@ -35,9 +36,8 @@ File_writer_OFF.o \ File_writer_VRML_2.o \ File_writer_inventor.o \ File_writer_wavefront.o \ -Fixed_precision_nt.o \ Float.o \ -Geomview_stream.o \ +Interval_arithmetic.o \ Origin.o \ Random.o \ aff_transformation_tags.o \ @@ -50,7 +50,7 @@ optimisation_basic.o #---------------------------------------------------------------------# lib: $(CGAL_OBJECTS) - $(CGAL_LIB_CREATE) $(CGAL_LIB) $(CGAL_OBJECTS) $(CGAL_LIB_LDFLAGS) + $(CGAL_LIB_CREATE) $(CGAL_LIB) $(CGAL_EXTRA_OBJECTS) $(CGAL_OBJECTS) $(CGAL_LIB_LDFLAGS) mv $(CGAL_LIB) $(CGAL_LIB_DIR)/$(CGAL_OS_COMPILER) rm $(CGAL_OBJECTS) diff --git a/Packages/Installation/src/makefile_sharedlib b/Packages/Installation/src/makefile_sharedlib index 66ff4045327..6bfde06f0df 100644 --- a/Packages/Installation/src/makefile_sharedlib +++ b/Packages/Installation/src/makefile_sharedlib @@ -26,6 +26,7 @@ CXXFLAGS = $(CGAL_SHARED_LIB_CXXFLAGS) \ CGAL_OBJECTS = \ Bbox_2.o \ Bbox_2_intersections.o \ +Color.o \ Double.o \ Double_eps.o \ File_header_OFF.o \ @@ -35,9 +36,8 @@ File_writer_OFF.o \ File_writer_VRML_2.o \ File_writer_inventor.o \ File_writer_wavefront.o \ -Fixed_precision_nt.o \ Float.o \ -Geomview_stream.o \ +Interval_arithmetic.o \ Origin.o \ Random.o \ aff_transformation_tags.o \ @@ -50,7 +50,7 @@ optimisation_basic.o #---------------------------------------------------------------------# lib: $(CGAL_OBJECTS) - $(CGAL_SHARED_LIB_CREATE) $(CGAL_SHARED_LIB) $(CGAL_OBJECTS) $(CGAL_SHARED_LIB_LDFLAGS) + $(CGAL_SHARED_LIB_CREATE) $(CGAL_SHARED_LIB) $(CGAL_EXTRA_OBJECTS) $(CGAL_OBJECTS) $(CGAL_SHARED_LIB_LDFLAGS) mv $(CGAL_SHARED_LIB) $(CGAL_LIB_DIR)/$(CGAL_OS_COMPILER) rm $(CGAL_OBJECTS)