ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/gen/SConscript
(Generate patch)

Comparing ray/src/gen/SConscript (file contents):
Revision 1.17 by schorsch, Thu Mar 10 01:49:56 2016 UTC vs.
Revision 1.18 by schorsch, Thu Mar 10 21:43:22 2016 UTC

# Line 11 | Line 11 | sun = env.Object(source="sun.c")
11   # standard targets
12   PROGS = (
13   # name          sources           libs
14 < ('gendaylit',   Split('gendaylit.c',)+[sun], ['rtlamps']),
15 < ('gendaymtx',   Split('gendaymtx.c',)+[sun],
16 <    ['rtproc','rtscene','rtmath','rtargs','rtio','rtcont','rtpath','rterror',mlib]),
14 > ('gendaylit',   Split('gendaylit.c',)+[sun], ['rtrad']),
15 > ('gendaymtx',   Split('gendaymtx.c',)+[sun], ['rtrad',mlib]),
16   ('genbeads',    Split('genbeads.c hermite3.c'),  []),
17   ('genbox',      ['genbox.c',],    []),
18   ('genmarble',   ['genmarble.c',], []),
19   ('gensky',      Split('gensky.c',)+[sun], []),
20   ('genblinds',   ['genblinds.c',], []),
21   ('genprism',    ['genprism.c',],  []),
22 < ('genrev',      ['genrev.c',],    ['rtfunc','rtcont','rtmem','rtio','rterror']),
22 > ('genrev',      ['genrev.c',],    ['rtrad',]),
23   ('gencatenary', ['gencat.c',],    []),
24 < ('genworm',     ['genworm.c',],
25 <        ['rtfunc','rtmem','rtcont','rtmath','rtio','rterror']),
27 < ('gensurf',     ['gensurf.c',],
28 <        ['rtfunc','rtmem','rtcont','rtmath','rtio','rterror']),
24 > ('genworm',     ['genworm.c',],   ['rtrad']),
25 > ('gensurf',     ['gensurf.c',],   ['rtrad']),
26   ('genclock',    ['genclock.c',],  []),
27   ('genbranch',   ['genbranch.c',], []),
28 < ('replmarks',   ['replmarks.c',],
29 <        ['rtproc','rtpath','rtmath','rtio','rterror']),
33 < ('xform',       ['xform.c',],
34 <    ['rtproc','rtscene','rtmath','rtargs','rtio','rtcont','rtpath','rterror']),
28 > ('replmarks',   ['replmarks.c',], ['rtrad']),
29 > ('xform',       ['xform.c',],     ['rtrad']),
30   )
31   progs = []
32   for p in PROGS:
# Line 42 | Line 37 | for p in PROGS:
37   prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'),
38                  source=Split('mkillum.c mkillum2.c mkillum3.c'),
39                  CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
40 <                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
46 <                'rtnet','rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']
47 <                + mlib)
40 >                LIBS=['raycalls','rttrace','rtrad'] + mlib)
41   progs.append(prog)
42   prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mksource'),
43                  source=['mksource.c'],
44                  CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
45 <                LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc','rtnet',
53 <                'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib)
45 >                LIBS=['raycalls','rttrace','rtrad'] + mlib)
46   progs.append(prog)
47  
48   if os.name == 'posix':

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines