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

Comparing ray/src/util/SConscript (file contents):
Revision 1.1 by schorsch, Tue Oct 21 19:27:29 2003 UTC vs.
Revision 1.14 by schorsch, Mon Apr 21 07:31:30 2008 UTC

# Line 2 | Line 2 | import os
2  
3   Import('env') # inherit from parent
4  
5 < # make a modified local copy
6 < util = env.Copy(LIBS=['rt'] + env['RAD_MLIB'])
5 > mlib = ['$RAD_MLIB']
6 > progs = []
7  
8   # compose paths
9 < def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
10 < def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
9 > def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
10 > def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
11  
12 + Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
13 +
14   # standard targets
15   PROGS = [
16 < ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c')),
17 < ('glarendx',  Split('glarendx.c')),
18 < ('vwright',   Split('vwright.c')),
19 < ('vwrays',    Split('vwrays.c')),
20 < ('rad',       Split('rad.c')),
21 < ('rpiece',    Split('rpiece.c Version.c')),
16 > ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'),
17 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
18 > ('glarendx',  Split('glarendx.c'), ['rtpic','rtargs','rtio','rtmath']),
19 > ('vwright',   Split('vwright.c'),  ['rtpic','rtargs','rtio','rtmath']),
20 > ('vwrays',    Split('vwrays.c'),   ['rtpic','rtargs','rtio','rtmath']),
21 > ('rad',       Split('rad.c'),
22 >        ['rtpic','rtproc','rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']),
23 > ('rpiece',    Split('rpiece.c') + [Version],
24 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
25 > ('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'],
26 >        ['rtpic','rtargs','rtio','rtproc','rtcont','rtmem','rtpath','rtmath',
27 >        'rtnet','rterror','$RAD_SOCKETLIB']),
28 > ('rtcontrib', ['rtcontrib.c', Version],
29 >        ['rtpic','rtargs','rtfunc','rtio','rtproc','rtcont','rtmem','rtpath',
30 >        'rtmath','rtnet','rterror','$RAD_SOCKETLIB'])
31   ]
32 < if os.name != 'nt': # XXX pending Windows version of netproc.c
22 <        PROGS.append(('ranimate',  Split('ranimate.c netproc.c')))
32 >
33   for p in PROGS:
34 <    prog = util.Program(target=radbin(p[0]), source=p[1])
35 <    Default(prog)
26 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], prog)])
34 >        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
35 >        progs.append(prog)
36  
37 < if os.name != 'nt': # XXX pending resolution of free_os() conflict
37 > #if os.name != 'nt': # XXX pending Windows version of raypcalls.c
38 > if True: # experimental raypwin.c
39          # targets with different includes/libs
40          rs = Split('ranimove.c ranimove1.c ranimove2.c')
41 <        for l in ['raycalls', 'radiance']: # XXX ugly
42 <                rs.append(radlib(util['LIBPREFIX'] + l + util['LIBSUFFIX']))
43 <        ranimove = util.Program(target=radbin('ranimove'), source=rs,
44 <                        CPPPATH=util.get('CPPPATH', []) + ['#src/rt'])
45 <        Default(ranimove)
46 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], ranimove)])
41 >        ranimove = env.Program(target=radbin('ranimove'), source=rs,
42 >                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
43 >                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
44 >                        'rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
45 >                        + mlib)
46 >        progs.append(ranimove)
47 >        rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
48 >                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
49 >                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
50 >                        'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
51 >                        'rtlamps'] + mlib)
52 >        progs.append(rsensor)
53  
54 < getinfo = util.Program(target=radbin('getinfo'), source='getinfo.c',
55 <                LIBS=['rt'])
56 < Default(getinfo)
41 < env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], getinfo)])
54 > getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
55 >                LIBS=['rtio'])
56 > progs.append(getinfo)
57  
43 # special targets not normally built
44 scanner = util.Program(target=radbin('scanner'), source='scanner.c', LIBS=['m'])
45 makedist = util.Program(target=radbin('makedist'),
46                source=Split('makedist.c setscan.c'))
47 scanner_i = util.Install(util['RAD_BINDIR'], scanner)
48 makedist_i = util.Install(util['RAD_BINDIR'], makedist)
49 util.Alias('util_special', [scanner, makedist])
50 util.Alias('util_special_install', [scanner_i, makedist_i])
58  
59   # X11 targets
60 < if util.has_key('X11LIB'):
61 <    util.Append(CPPPATH=util['X11INCLUDE'])
62 <    util.Append(LIBS='X11')
63 <    util.Append(LIBPATH=util['X11LIB'])
64 <    xglaresrc = util.Program(target=radbin('xglaresrc'),
65 <                        source=Split('xglaresrc.c x11findwind.c'),)
66 <    Default(xglaresrc)
67 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], xglaresrc)])
60 > if env.has_key('X11LIB'):
61 >        xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
62 >        xlibp = env.get('LIBPATH', []) + ['$X11LIB']
63 >        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
64 >                        CPPPATH=xincl)
65 >        xglaresrc = env.Program(target=radbin('xglaresrc'),
66 >                        source=Split('xglaresrc.c') + [x11findwind],
67 >                        LIBPATH=xlibp, CPPPATH=xincl,
68 >                        LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
69 >        progs.append(xglaresrc)
70  
71 <    # OpenGL targets that also depend on X11
72 <    if util.has_key('OGL'):
73 <        glrad = util.Program(target=radbin('glrad'), source=Split('glrad.c'),
74 <            CPPFLAGS=util.get('CPPFLAGS', []) + [util['RAD_STEREO']],
75 <            LIBS=['rgl', 'GL', 'GLU']+util['LIBS'],)
76 <        Default(glrad)
77 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], glrad)])
71 >        # OpenGL targets that also depend on X11
72 >        if env.has_key('OGL'):
73 >                glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
74 >                        CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
75 >                        LIBPATH=xlibp, CPPPATH=xincl,
76 >                        LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
77 >                        'rtmath','rtcont','rtmem','rterror',
78 >                        'GL', 'GLU','X11'],)
79 >                progs.append(glrad)
80  
81 + if os.name == 'posix': # XXX ignoring trad.wsh
82 +        for s in Split('''objview objline objpict glare dayfact
83 +                        debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
84 +                Default(env.InstallCsh(radbin(s), s + '.csh'))
85 + # Those don't really work yet
86 + #else:
87 + #       for s in Split('''objview glare rlux '''):
88 + #               prog = env.Program(target=radbin(s), source=s+'.c')
89 + #               progs.append(prog)
90 +
91 + Default('#src/util')
92 + env.Install('$RAD_BINDIR', progs)
93  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines