--- ray/src/ot/SConscript 2016/03/05 13:24:58 1.6 +++ ray/src/ot/SConscript 2016/03/18 22:57:24 1.9 @@ -4,21 +4,21 @@ Import('env') # inherit from parent # math libs mlib = env['RAD_MLIB'] +addobj = env.get('ADDOBJNOTIFY') # standard targets -env.Object(source='bbox.c') -env.Object(source='o_face.c') +bbox = env.Object(source='bbox.c') +o_face = env.Object(source='o_face.c') PROGS = ( -('oconv', Split('''oconv.c writeoct.c bbox.o initotypes.c - sphere.c o_face.o o_cone.c o_instance.c'''), []), -('getbbox', Split('getbbox.c readobj2.c bbox.o init2otypes.c'), []), -('obj2mesh', Split('obj2mesh.c cvmesh.c wfconv.c o_face.o writemesh.c'), - ['rtdummy']), +('oconv', Split('''oconv.c writeoct.c initotypes.c sphere.c + o_cone.c o_instance.c''') +[bbox, o_face], []), +('getbbox', Split('getbbox.c readobj2.c init2otypes.c') +[bbox], []), +('obj2mesh', Split('obj2mesh.c cvmesh.c wfconv.c writemesh.c')+[o_face,addobj], + []), ) for p in PROGS: prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]), - source=p[1], LIBS=['rtproc','rtscene','rtpath','rtio','rtmath', - 'rtargs','rtcont','rtmem','rterror','rtproc']+p[2]+mlib) + source=p[1], LIBS=['rtrad']+p[2]+mlib) Default(prog) env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])