--- dawn_3_85d/Makefile.in.ORIG Thu Mar 20 15:43:37 2003 +++ dawn_3_85d/Makefile.in Sun May 18 00:15:03 2003 @@ -35,210 +35,213 @@ FRMark.o \ polyhedron.o +CXXFLAGS = $(WARNING) $(OPTIMIZE) +LDFLAGS = $(OPTIMIZE) -flat_namespace -undefined suppress + ### Commpilation $(EXEC): $(OBJ) $(GUI_MENU) - $(CC) $(WARNING) $(OPTIMIZE) $(LIB_DIR) -o $(EXEC) $(OBJ) $(OPENGL_LIB) $(OPENGL_INC) $(GLLIBS) $(SOCKET_LIBS) $(LIBS) + $(CC) $(LDFLAGS) $(LIB_DIR) -o $(EXEC) $(OBJ) $(OPENGL_LIB) $(OPENGL_INC) $(GLLIBS) $(SOCKET_LIBS) $(LIBS) strip $(EXEC) cp $(EXEC) ./$(PRIM_DATA_DIR) ################################################ -# $(CC) $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) -o $(G4TEST_INET) $(G4TEST_INET).cc FRClientServer.o $(SOCKET_LIBS) +# $(CC) $(WARNING) $(OPTIMIZE) $(LDFLAGS) $(INCLUDE_DIR) -o $(G4TEST_INET) $(G4TEST_INET).cc FRClientServer.o $(SOCKET_LIBS) # strip $(G4TEST_INET) -# $(CC) $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) -o $(G4TEST_UNIX) $(G4TEST_UNIX).cc FRClientServer.o $(SOCKET_LIBS) +# $(CC) $(WARNING) $(OPTIMIZE) $(LDFLAGS) $(INCLUDE_DIR) -o $(G4TEST_UNIX) $(G4TEST_UNIX).cc FRClientServer.o $(SOCKET_LIBS) # strip $(G4TEST_UNIX) ################################################ $(G4TEST_INET): g4test_inet.cc FRClientServer.o - $(CC) $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) -o $(G4TEST_INET) $(G4TEST_INET).cc FRClientServer.o $(SOCKET_LIBS) + $(CC) $(WARNING) $(OPTIMIZE) $(LDFLAGS) $(INCLUDE_DIR) -o $(G4TEST_INET) $(G4TEST_INET).cc FRClientServer.o $(SOCKET_LIBS) strip $(G4TEST_INET) $(G4TEST_UNIX): g4test_unix.cc FRClientServer.o - $(CC) $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) -o $(G4TEST_UNIX) $(G4TEST_UNIX).cc FRClientServer.o $(SOCKET_LIBS) + $(CC) $(WARNING) $(OPTIMIZE) $(LDFLAGS) $(INCLUDE_DIR) -o $(G4TEST_UNIX) $(G4TEST_UNIX).cc FRClientServer.o $(SOCKET_LIBS) strip $(G4TEST_UNIX) main.o: main.cc main_selector.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) main.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) main.cc main_selector1.o: main_selector1.cc main_selector.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) main_selector1.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) main_selector1.cc main_selector2.o: main_selector2.cc main_selector.h FRServer.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) main_selector2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) main_selector2.cc main_selector3.o: main_selector3.cc main_selector.h FRServer.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) main_selector3.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) main_selector3.cc parameter.o: parameter.cc parameter.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) parameter.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) parameter.cc command1.o: command1.cc command.h version.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command1.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command1.cc command2.o: command2.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command2.cc command3.o: command3.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command3.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command3.cc command4.o: command4.cc command.h command4a.icc - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command4.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command4.cc command_tk.o: command_tk.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command_tk.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command_tk.cc command_x.o: command_x.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command_x.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command_x.cc command_ps.o: command_ps.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command_ps.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command_ps.cc command_ps2.o: command_ps2.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command_ps2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command_ps2.cc command_gl.o: command_gl.cc command.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) command_gl.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) command_gl.cc vector.o: vector.cc vector.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) vector.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) vector.cc perspective.o: perspective.cc perspective.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) perspective.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) perspective.cc tool2d.o: tool2d.cc tool2d.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) tool2d.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) tool2d.cc tool3d.o: tool3d.cc tool3d.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) tool3d.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) tool3d.cc toolio.o: toolio.cc toolio.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) toolio.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) toolio.cc toolstring.o: toolstring.cc toolstring.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) toolstring.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) toolstring.cc hid1.o: hid1.cc hid.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) hid1.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) hid1.cc hid2.o: hid2.cc hid.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) hid2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) hid2.cc hidA.o: hidA.cc hid.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) hidA.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) hidA.cc hidB.o: hidB.cc hid.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) hidB.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) hidB.cc hidC.o: hidC.cc hid.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) hidC.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) hidC.cc shading.o: shading.cc shading.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) shading.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) shading.cc object1.o: object1.cc object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) object1.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) object1.cc object2.o: object2.cc object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) object2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) object2.cc object3.o: object3.cc object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) object3.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) object3.cc postscript.o: postscript.cc postscript.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) postscript.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) postscript.cc postscript2.o: postscript2.cc postscript.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) postscript2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) postscript2.cc filereader.o: filereader.cc filereader.h object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) filereader.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) filereader.cc filereader2.o: filereader2.cc filereader.h object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) filereader2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) filereader2.cc filereader3.o: filereader3.cc filereader.h object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) filereader3.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) filereader3.cc filereader_old.o: filereader_old.cc filereader.h object.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) filereader_old.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) filereader_old.cc linesegment.o: linesegment.cc linesegment.h perspective.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) linesegment.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) linesegment.cc hidline.o: hidline.cc hidline.h hid.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) hidline.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) hidline.cc x_window.o: x_window.cc x_window.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) x_window.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) x_window.cc ps2x.o: ps2x.cc ps2x.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) ps2x.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) ps2x.cc FROpenGL.o: FROpenGL.cc FROpenGL.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FROpenGL.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FROpenGL.cc FRArray.o: FRArray.cc FRArray.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRArray.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRArray.cc FRCommandAnalyzer.o: FRCommandAnalyzer.cc FRCommandAnalyzer.h FRCommandList.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRCommandAnalyzer.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRCommandAnalyzer.cc FRClientServer.o: FRClientServer.cc FRClientServer.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRClientServer.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRClientServer.cc FRBrepGenerator.o: FRBrepGenerator.cc FRBrepGenerator.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRBrepGenerator.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRBrepGenerator.cc FRBrepGenerator2.o: FRBrepGenerator2.cc FRBrepGenerator.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRBrepGenerator2.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRBrepGenerator2.cc FRObjectGenerator.o: FRObjectGenerator.cc FRObjectGenerator.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRObjectGenerator.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRObjectGenerator.cc FRTrigonometric.o: FRTrigonometric.cc FRTrigonometric.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRTrigonometric.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRTrigonometric.cc FRPolylineForBrep.o: FRPolylineForBrep.cc FRPolylineForBrep.h FRPolyline.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRPolylineForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRPolylineForBrep.cc FRBoxForBrep.o: FRBoxForBrep.cc FRBoxForBrep.h FRBox.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRBoxForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRBoxForBrep.cc FRTrdForBrep.o: FRTrdForBrep.cc FRTrdForBrep.h FRTrd.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRTrdForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRTrdForBrep.cc FRTrapForBrep.o: FRTrapForBrep.cc FRTrapForBrep.h FRTrap.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRTrapForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRTrapForBrep.cc FRParallelepipedForBrep.o: FRParallelepipedForBrep.cc FRParallelepipedForBrep.h FRParallelepiped.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRParallelepipedForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRParallelepipedForBrep.cc FRTubeSegForBrep.o: FRTubeSegForBrep.cc FRTubeSegForBrep.h FRTubeSeg.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRTubeSegForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRTubeSegForBrep.cc FRConeSegForBrep.o: FRConeSegForBrep.cc FRConeSegForBrep.h FRConeSeg.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRConeSegForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRConeSegForBrep.cc FRSphereForBrep.o: FRSphereForBrep.cc FRSphereForBrep.h FRSphere.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRSphereForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRSphereForBrep.cc FRSphereSegForBrep.o: FRSphereSegForBrep.cc FRSphereSegForBrep.h FRSphereSeg.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRSphereSegForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRSphereSegForBrep.cc FRPolygonForBrep.o: FRPolygonForBrep.cc FRPolygonForBrep.h FRPolygon.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRPolygonForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRPolygonForBrep.cc FRPolyconeForBrep.o: FRPolyconeForBrep.cc FRPolyconeForBrep.h FRPolycone.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRPolyconeForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRPolyconeForBrep.cc FRTorusForBrep.o: FRTorusForBrep.cc FRTorusForBrep.h FRTorus.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRTorusForBrep.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRTorusForBrep.cc FRMark.o: FRMark.cc FRMark.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) FRMark.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) FRMark.cc polyhedron.o: polyhedron.cc polyhedron.h - $(CC) -c $(WARNING) $(OPTIMIZE) $(INCLUDE_DIR) polyhedron.cc + $(CC) -c $(CXXFLAGS) $(INCLUDE_DIR) polyhedron.cc $(GUI_MENU):