--- ray/src/gen/SConscript 2008/04/24 10:28:25 1.9 +++ ray/src/gen/SConscript 2010/12/15 01:40:11 1.13 @@ -8,6 +8,7 @@ mlib = env['RAD_MLIB'] # standard targets PROGS = ( # name sources libs +('gendaylit', Split('gendaylit.c sun.c',), ['rtlamps']), ('genbeads', Split('genbeads.c hermite3.c'), []), ('genbox', ['genbox.c',], []), ('genmarble', ['genmarble.c',], []), @@ -37,11 +38,8 @@ for p in PROGS: source=p[1], LIBS=p[2] + mlib) progs.append(prog) -ezxml = env.Object('ezxml.c', - CPPDEFINES=env.get('CPPDEFINES',[]) + env.get('EZXML_CPPDEFINES',[])) - prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'), - source=Split('mkillum.c mkillum2.c mkillum3.c mkillum4.c') + ezxml, + source=Split('mkillum.c mkillum2.c mkillum3.c'), CPPPATH=env.get('CPPPATH', []) + ['#src/rt'], LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc', 'rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror'] @@ -49,7 +47,7 @@ prog = env.Program(target=os.path.join('$RAD_BUILDBIN' prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mksource'), source=['mksource.c'], CPPPATH=env.get('CPPPATH', []) + ['#src/rt'], - LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc', + LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc', 'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib) progs.append(prog) @@ -60,7 +58,7 @@ Default('#src/gen') env.Install('$RAD_BINDIR', progs) #surf.cal clockface.hex -LIBFILES = Split('illum.cal rev.cal skybright.cal surf.cal glaze1.cal glaze2.cal clockface.hex') +LIBFILES = Split('illum.cal rev.cal skybright.cal glaze1.cal glaze2.cal') env.Append(RAD_RLIBINSTALL=env.Install('$RAD_RLIBDIR', LIBFILES))