--- ray/src/gen/Rmakefile 2023/02/09 00:18:05 2.42 +++ ray/src/gen/Rmakefile 2024/09/16 17:01:53 2.47 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.42 2023/02/09 00:18:05 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.47 2024/09/16 17:01:53 greg Exp $ # # Makefile for object generation programs # @@ -7,6 +7,7 @@ OPT = -O MACH = -DBSD CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH) CC = cc +PTHD = -pthread MLIB = -lm INSTALL = cp @@ -16,10 +17,10 @@ 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 + glaze1.cal glaze2.cal perezlum.cal perezlum_c.cal mie_ca.dat all: $(PROGS) @@ -71,7 +72,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 @@ -89,6 +90,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 \ @@ -127,3 +137,12 @@ 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 + +genssky.o gensdaymtx.o: atmos.h + +atmos.o: ../common/rtio.h ../common/rtmath.h ../common/color.h \ +../common/data.h sun.h + $(CC) $(CFLAGS) $(PTHD) -c atmos.c