--- ray/src/gen/Rmakefile 2014/07/30 17:30:27 2.35 +++ ray/src/gen/Rmakefile 2023/02/09 00:18:05 2.42 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.35 2014/07/30 17:30:27 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.42 2023/02/09 00:18:05 greg Exp $ # # Makefile for object generation programs # @@ -9,6 +9,8 @@ CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH) CC = cc MLIB = -lm +INSTALL = cp + INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray @@ -17,12 +19,12 @@ PROGS = genbox gensky xform genblinds genrev genworm g gensurf genprism replmarks mkillum mksource genclock LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \ - glaze1.cal glaze2.cal perezlum.cal + glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal all: $(PROGS) install: $(PROGS) $(LIBFILES) glaze.csh - cp $(PROGS) $(INSTDIR) + $(INSTALL) $(PROGS) $(INSTDIR) cp glaze.csh $(INSTDIR)/glaze chmod 755 $(INSTDIR)/glaze cd $(LIBDIR) && rm -f $(LIBFILES) @@ -35,13 +37,13 @@ genbeads: genbeads.o hermite3.o $(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o $(MLIB) genbox: genbox.o - $(CC) $(CFLAGS) -o genbox genbox.o + $(CC) $(CFLAGS) -o genbox genbox.o -lwfobj -lrtrad $(MLIB) genmarble: genmarble.o ../common/random.h $(CC) $(CFLAGS) -o genmarble genmarble.o $(MLIB) gensky: gensky.o sun.o - $(CC) $(CFLAGS) -o gensky gensky.o sun.o $(MLIB) + $(CC) $(CFLAGS) -o gensky gensky.o sun.o -lrtrad $(MLIB) gendaylit: gendaylit.o sun.o $(CC) $(CFLAGS) -o gendaylit gendaylit.o sun.o -lrtrad $(MLIB) @@ -50,10 +52,10 @@ gendaymtx: gendaymtx.o sun.o $(CC) $(CFLAGS) -o gendaymtx gendaymtx.o sun.o -lrtrad $(MLIB) genblinds: genblinds.o - $(CC) $(CFLAGS) -o genblinds genblinds.o $(MLIB) + $(CC) $(CFLAGS) -o genblinds genblinds.o -lrtrad $(MLIB) genprism: genprism.o - $(CC) $(CFLAGS) -o genprism genprism.o $(MLIB) + $(CC) $(CFLAGS) -o genprism genprism.o -lrtrad $(MLIB) xform: xform.o $(CC) $(CFLAGS) -o xform xform.o -lrtrad $(MLIB) @@ -99,6 +101,8 @@ gensurf.o xform.o: ../common/standard.h \ ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/rterror.h \ ../common/mat4.h ../common/fvect.h + +genbox.o: ../common/fvect.h ../common/objutil.h ../common/rtio.h genworm.o genrev.o gensurf.o: ../common/resolu.h ../common/rterror.h