ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/hd/Rmakefile
(Generate patch)

Comparing ray/src/hd/Rmakefile (file contents):
Revision 3.28 by greg, Wed Nov 21 17:52:05 2007 UTC vs.
Revision 3.29 by greg, Sat Nov 24 00:37:27 2007 UTC

# Line 9 | Line 9 | OPT = -O
9  
10   CFLAGS = -I../common -L../lib $(OPT) $(MACH) -DDEVPATH=\"$(DEVDIR)\"
11  
12 + MLIB = -lm
13 +
14   CC = cc
15  
16   SPECIAL =
# Line 47 | Line 49 | sun:
49   rholo:  rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \
50   viewbeams.o Version.o
51          $(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
52 < holo.o holofile.o viewbeams.o Version.o -lrtrad -lm
52 > holo.o holofile.o viewbeams.o Version.o -lrtrad $(MLIB)
53  
54   rhpict: rhpict.o rhpict2.o holo.o holofile.o viewbeams.o Version.o
55          $(CC) $(CFLAGS) -o rhpict rhpict.o rhpict2.o holo.o holofile.o \
56 < viewbeams.o Version.o -lrtrad -lm
56 > viewbeams.o Version.o -lrtrad $(MLIB)
57  
58   rhcopy: rhcopy.o clumpbeams.o holo.o holofile.o
59          $(CC) $(CFLAGS) -o rhcopy rhcopy.o clumpbeams.o \
60 < holo.o holofile.o -lrtrad -lm
60 > holo.o holofile.o -lrtrad $(MLIB)
61  
62   rhoptimize:     rhoptimize.o clumpbeams.o holo.o holofile.o
63          $(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
64 < holo.o holofile.o -lrtrad -lm
64 > holo.o holofile.o -lrtrad $(MLIB)
65  
66   rhinfo: rhinfo.o holo.o holofile.o
67 <        $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrtrad -lm
67 >        $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrtrad $(MLIB)
68  
69   genrhgrid:      genrhgrid.o holo.o
70 <        $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrtrad -lm
70 >        $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrtrad $(MLIB)
71  
72   $(DEVDIR)/x11h.hdi:     $(DEVDIR)/x11.hdi
73          rm -f $(DEVDIR)/x11h.hdi
# Line 74 | Line 76 | $(DEVDIR)/x11h.hdi:    $(DEVDIR)/x11.hdi
76   $(DEVDIR)/x11.hdi:      rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
77   rhd_qtree2r.o rhd_ctab.o holo.o
78          $(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
79 < rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrtrad -lX11 -lm
79 > rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrtrad -lX11
80  
81   $(DEVDIR)/glx1h.hdi:    $(DEVDIR)/glx1.hdi
82          rm -f $(DEVDIR)/glx1h.hdi
# Line 117 | Line 119 | viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrtrad -
119   $(DEVDIR)/ogl.hdi:      rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
120   rhd_odraw.o rhd_geom.o holo.o
121          $(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
122 < viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrtrad -lGLU -lGL -lX11 -lm
122 > viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrtrad -lGLU -lGL -lX11
123  
124   $(DEVDIR)/oglo.hdi:     rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
125   rhd_odraw.o rhd_geom.o holo.o rhdobj.o
126          $(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \
127   rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
128 < -lrgl -lrtrad -lGLU -lGL -lX11 -lm
128 > -lrgl -lrtrad -lGLU -lGL -lX11
129  
130   $(DEVDIR)/ogls.hdi:     rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
131   rhd_odraw.o rhd_geom.o holo.o
132          $(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
133   viewbeams.o holo.o rhd_odraw.o rhd_geom.o \
134 < -lrgl -lrtrad -lGLU -lGL -lX11 -lXext -lm
134 > -lrgl -lrtrad -lGLU -lGL -lX11 -lXext
135  
136   $(DEVDIR)/oglso.hdi:    rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
137   rhd_odraw.o rhd_geom.o holo.o rhdobj.o
138          $(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
139   viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
140 < -lrgl -lrtrad -lGLU -lGL -lX11 -lXext -lm
140 > -lrgl -lrtrad -lGLU -lGL -lX11 -lXext
141  
142   rhd_ogl0.o:     rhd_ogl.c
143          $(CC) $(CFLAGS) -c rhd_ogl.c

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines