--- ray/src/gen/Rmakefile 2021/04/18 02:30:37 2.40 +++ ray/src/gen/Rmakefile 2024/08/02 18:47:25 2.44 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.40 2021/04/18 02:30:37 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.44 2024/08/02 18:47:25 greg Exp $ # # Makefile for object generation programs # @@ -9,12 +9,14 @@ CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH) CC = cc MLIB = -lm +INSTALL = cp + INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray PROGS = genbox gensky xform genblinds genrev genworm gendaylit gendaymtx \ - gensurf genprism replmarks mkillum mksource genclock + gensurf genprism replmarks mkillum mksource genclock genssky gensdaymtx LIBFILES = illum.cal rev.cal skybright.cal surf.cal clockface.hex \ glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal @@ -22,7 +24,7 @@ LIBFILES = illum.cal rev.cal skybright.cal surf.cal cl 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,7 +37,7 @@ genbeads: genbeads.o hermite3.o $(CC) $(CFLAGS) -o genbeads genbeads.o hermite3.o $(MLIB) genbox: genbox.o - $(CC) $(CFLAGS) -o genbox genbox.o -lwfobj -lrtrad + $(CC) $(CFLAGS) -o genbox genbox.o -lwfobj -lrtrad $(MLIB) genmarble: genmarble.o ../common/random.h $(CC) $(CFLAGS) -o genmarble genmarble.o $(MLIB) @@ -69,7 +71,7 @@ mksource: mksource.o $(CC) $(CFLAGS) -o mksource mksource.o \ -lraycalls -lradiance -lrtrad $(MLIB) -genrev: genrev.o +genrev: genrev.o $(CC) $(CFLAGS) -o genrev genrev.o -lrtrad $(MLIB) gencatenary: gencat.o @@ -87,6 +89,15 @@ genclock: genclock.o genbranch: genbranch.o $(CC) $(CFLAGS) -o genbranch genbranch.o $(MLIB) + +# Assume rt is built before this +genssky: genssky.o sun.o atmos.o + $(CC) $(CFLAGS) -o genssky genssky.o sun.o atmos.o -lrtrad $(MLIB) + +gensdaymtx: gensdaymtx.o sun.o atmos.o + $(CC) $(CFLAGS) -o gensdaymtx gensdaymtx.o sun.o atmos.o -lrtrad $(MLIB) + + mksource.o: ../common/random.h ../rt/ray.h ../common/octree.h \ ../common/object.h ../common/color.h \ ../common/standard.h ../common/rtmisc.h ../common/rtio.h \ @@ -125,3 +136,9 @@ gendaylit.o gensky.o sun.o: sun.h gendaymtx.o: ../common/platform.h ../common/rtmath.h \ ../common/mat4.h ../common/fvect.h ../common/color.h + +genssky.o: ../common/rtio.h ../common/rtmath.h \ +../common/paths.h ../common/color.h + +atmos.o: ../common/rtio.h ../common/rtmath.h ../common/color.h \ +../common/data.h sun.h