--- ray/src/cv/Rmakefile 2006/05/19 03:50:13 2.28 +++ ray/src/cv/Rmakefile 2007/11/21 17:52:04 2.30 @@ -1,4 +1,4 @@ -# RCSid $Id: Rmakefile,v 2.28 2006/05/19 03:50:13 greg Exp $ +# RCSid $Id: Rmakefile,v 2.30 2007/11/21 17:52:04 greg Exp $ # # Makefile for conversion programs # @@ -21,7 +21,7 @@ LIBDIR = /usr/local/lib/ray MGF_LIB = ../lib/libmgf.a PROGS = ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \ -mgf2rad rad2mgf mgf2meta mgfilt mgf2inv +mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf LIBFILES = source.cal tilt.cal lamp.tab window.cal @@ -67,19 +67,25 @@ mgf2meta: $(MGF_LIB) mgf2meta.o mgfilt: cd mgflib ; rm -f mgfilt ; \ - make mgfilt CC=$(CC) \ + make mgfilt CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv mgfilt .. mgf2inv: cd mgflib ; rm -f mgf2inv ; \ - make mgf2inv CC=$(CC) \ + make mgf2inv CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv mgf2inv .. +3ds2mgf: + cd mgflib ; rm -f 3ds2mgf ; \ + make 3ds2mgf CC=$(CC) \ + CFLAGS="$(OPT) $(MACH)" ; \ + mv 3ds2mgf .. + $(MGF_LIB): cd mgflib ; rm -f libmgf.a ; \ - make libmgf.a CC=$(CC) \ + make libmgf.a CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv libmgf.a ../../lib