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

Comparing ray/src/meta/SConscript (file contents):
Revision 1.6 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.7 by schorsch, Thu Mar 10 21:43:23 2016 UTC

# Line 35 | Line 35 | libmeta = env.StaticLibrary(radlib('meta'),
35  
36   # standard targets
37   PROGS = (
38 < ('meta2bmp', Split('meta2bmp.c') +[rplot, palloc, plot] + common,
39 <        ['rtproc','rtpath','rtpic','rtio', # proc/path/rtio for win_popen()
40 <        'rtcont','rtmem','rterror']),
41 < ('meta2tga', Split('meta2tga.c') +[rplot, palloc, plot] + common,
42 <        ['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
43 <        'rtcont','rtmem','rterror']),
44 < ('pexpand',  Split('pexpand.c expand.c segment.c') +[palloc]+ common,
45 <        ['rtcont','rtmem','rterror']),
46 < ('psort',    Split('psort.c sort.c') +[palloc]+ common,
47 <        ['rtpath','rtcont','rtmem','rterror']),
48 < ('cv',       Split('cv.c cvhfio.c') + common,
49 <        ['rtcont','rtmem','rterror']),
50 < ('psmeta',   Split('psmeta.c psplot.c') + common,
51 <        ['rtcont','rtmem','rterror']),
52 < ('plotin',   [plotin, primout] + common,
53 <        ['rtcont','rtmem','rterror']),
54 < ('bgraph',   [bgraph, mgraph, mgvars],
55 <        ['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
56 <        'rtfunc','rtcont','rtmem','meta','rterror']),
57 < ('igraph',   [igraph, gcalc, cgraph, mgraph, mgvars],
58 <        ['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
59 <        'rtfunc','rtcont','rtmem','meta','rterror']),
60 < ('dgraph',   [dgraph, cgraph, mgvars],
61 <        ['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
62 <        'rtfunc','rtcont','rtmem','rterror']),
63 < ('gcomp',    [gcomp, gcalc, mgvars],
64 <        ['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
65 <        'rtfunc','rtcont','rtmem','rterror']),
66 < ('plot4',    Split('plot4.c') +[primout]+ common,
67 <        ['rtproc','rtpath','rtio', # proc/path/rtio for win_popen()
68 <        'rtcont','rtmem','rterror']),
38 > ('meta2bmp', Split('meta2bmp.c') +[rplot, palloc, plot] + common, ['rtrad']),
39 > ('meta2tga', Split('meta2tga.c') +[rplot, palloc, plot] + common, ['rtrad']),
40 > ('pexpand',  Split('pexpand.c expand.c segment.c') +[palloc]+ common,['rtrad']),
41 > ('psort',    Split('psort.c sort.c') +[palloc]+ common, ['rtrad']),
42 > ('cv',       Split('cv.c cvhfio.c') + common, ['rtrad']),
43 > ('psmeta',   Split('psmeta.c psplot.c') + common, ['rtrad']),
44 > ('plotin',   [plotin, primout] + common, ['rtrad']),
45 > ('bgraph',   [bgraph, mgraph, mgvars], ['rtrad', 'meta']),
46 > ('igraph',   [igraph, gcalc, cgraph, mgraph, mgvars], ['rtrad', 'meta']),
47 > ('dgraph',   [dgraph, cgraph, mgvars], ['rtrad']),
48 > ('gcomp',    [gcomp, gcalc, mgvars], ['rtrad']),
49 > ('plot4',    Split('plot4.c') +[primout]+ common, ['rtrad']),
50   )
51   for p in PROGS:
52          prog = env.Program(target=radbin(p[0]), source=p[1],
53 <                        LIBS=p[2]+env['RAD_MLIB'])
53 >                        LIBS=p[2]+env['RAD_MLIB'], )
54          Default(prog)
55          env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
56  
76
77
57   # X11 targets
58   if env.has_key('X11LIB'):
59          x11meta = env.Program(radbin('x11meta'), [plotin, primout]+ common,
60                  CPPPATH=env.get('CPPPATH',[])+[env['X11INCLUDE']],
61                  LIBPATH=env.get('LIBPATH',[])+[env['X11LIB']],
62 <                LIBS=['rtcont','rtmem','rterror', 'X11'] + env['RAD_MLIB'])
62 >                LIBS=['rtrad', 'X11'] + env['RAD_MLIB'])
63          Default(x11meta)
64          env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], x11meta)])
65  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines