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.8 by schorsch, Mon Jan 8 13:38:37 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines