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.7 by schorsch, Thu Oct 21 15:47:13 2004 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 + setscan = env.Object(source='setscan.c')
13 + Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
14 +
15   # standard targets
16   PROGS = [
17 < ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c')),
18 < ('glarendx',  Split('glarendx.c')),
19 < ('vwright',   Split('vwright.c')),
20 < ('vwrays',    Split('vwrays.c')),
21 < ('rad',       Split('rad.c')),
22 < ('rpiece',    Split('rpiece.c Version.c')),
17 > ('findglare', Split('findglare.c glareval.c glaresrc.c')+[setscan],
18 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
19 > #('contour',   Split('contour.c'),  ['rtmath']), # XXX what is this?
20 > ('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
21 > ('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
22 > ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
23 > ('rad',       Split('rad.c'),
24 >        ['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
25 > ('rpiece',    Split('rpiece.c') + [Version],
26 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
27   ]
28 < if os.name != 'nt': # XXX pending Windows version of netproc.c
29 <        PROGS.append(('ranimate',  Split('ranimate.c netproc.c')))
28 > if os.name == 'nt': # XXX should be set in a *.cfg file
29 >        netproc = 'win_netproc.c'
30 >        netlib = ['ws2_32']
31 > else:
32 >        netproc = 'netproc.c'
33 >        netlib = []
34 >
35 > PROGS.append(('ranimate',  ['ranimate.c', netproc],
36 >        ['rtpic','rtargs','rtio','rtcont','rtmem','rtpath','rtmath','rtnet','rterror'] + netlib))
37   for p in PROGS:
38 <    prog = util.Program(target=radbin(p[0]), source=p[1])
39 <    Default(prog)
26 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], prog)])
38 >        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
39 >        progs.append(prog)
40  
41 < if os.name != 'nt': # XXX pending resolution of free_os() conflict
41 > if os.name != 'nt': # XXX pending Windows version of raypcalls.c
42          # targets with different includes/libs
43          rs = Split('ranimove.c ranimove1.c ranimove2.c')
44 <        for l in ['raycalls', 'radiance']: # XXX ugly
45 <                rs.append(radlib(util['LIBPREFIX'] + l + util['LIBSUFFIX']))
46 <        ranimove = util.Program(target=radbin('ranimove'), source=rs,
47 <                        CPPPATH=util.get('CPPPATH', []) + ['#src/rt'])
48 <        Default(ranimove)
36 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], ranimove)])
44 >        ranimove = env.Program(target=radbin('ranimove'), source=rs,
45 >                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
46 >                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
47 >                        'rtmath','rtcont','rtmem','rtargs','rtproc','rtpath','rterror'] + mlib)
48 >        progs.append(ranimove)
49  
50 < getinfo = util.Program(target=radbin('getinfo'), source='getinfo.c',
51 <                LIBS=['rt'])
52 < Default(getinfo)
41 < env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], getinfo)])
50 > getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
51 >                LIBS=['rtio'])
52 > progs.append(getinfo)
53  
54   # special targets not normally built
55 < scanner = util.Program(target=radbin('scanner'), source='scanner.c', LIBS=['m'])
56 < makedist = util.Program(target=radbin('makedist'),
57 <                source=Split('makedist.c setscan.c'))
58 < scanner_i = util.Install(util['RAD_BINDIR'], scanner)
59 < makedist_i = util.Install(util['RAD_BINDIR'], makedist)
60 < util.Alias('util_special', [scanner, makedist])
61 < util.Alias('util_special_install', [scanner_i, makedist_i])
55 > if os.name != 'nt': # XXX pending replacement of fork() and friends
56 >        scanner = env.Program(target=radbin('scanner'), source='scanner.c',
57 >                        LIBS=mlib)
58 >        scanner_i = env.Install('$RAD_BINDIR', scanner)
59 >        makedist = env.Program(target=radbin('makedist'),
60 >                        source=Split('makedist.c')+[setscan],
61 >                        LIBS=['rtmath']+mlib)
62 >        makedist_i = env.Install('$RAD_BINDIR', makedist)
63 >        env.Alias('util_special', [scanner, makedist])
64 >        env.Alias('util_special_install', [scanner_i, makedist_i])
65  
66   # X11 targets
67 < if util.has_key('X11LIB'):
68 <    util.Append(CPPPATH=util['X11INCLUDE'])
69 <    util.Append(LIBS='X11')
70 <    util.Append(LIBPATH=util['X11LIB'])
71 <    xglaresrc = util.Program(target=radbin('xglaresrc'),
72 <                        source=Split('xglaresrc.c x11findwind.c'),)
73 <    Default(xglaresrc)
74 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], xglaresrc)])
67 > if env.has_key('X11LIB'):
68 >        xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
69 >        xlibp = env.get('LIBPATH', []) + ['$X11LIB']
70 >        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
71 >                        CPPPATH=xincl)
72 >        xglaresrc = env.Program(target=radbin('xglaresrc'),
73 >                        source=Split('xglaresrc.c') + [x11findwind],
74 >                        LIBPATH=xlibp, CPPPATH=xincl,
75 >                        LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
76 >        progs.append(xglaresrc)
77  
78 <    # OpenGL targets that also depend on X11
79 <    if util.has_key('OGL'):
80 <        glrad = util.Program(target=radbin('glrad'), source=Split('glrad.c'),
81 <            CPPFLAGS=util.get('CPPFLAGS', []) + [util['RAD_STEREO']],
82 <            LIBS=['rgl', 'GL', 'GLU']+util['LIBS'],)
83 <        Default(glrad)
84 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], glrad)])
78 >        # OpenGL targets that also depend on X11
79 >        if env.has_key('OGL'):
80 >                glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
81 >                        CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
82 >                        LIBPATH=xlibp, CPPPATH=xincl,
83 >                        LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
84 >                        'rtmath','rtcont','rtmem','rterror',
85 >                        'GL', 'GLU','X11'],)
86 >                progs.append(glrad)
87  
88 + if os.name == 'posix': # XXX ignoring trad.wsh
89 +        for s in Split('''objview objline objpict
90 +                        glare dayfact debugcal rlux raddepend compamb vinfo genambpos'''):
91 +                Default(env.InstallCsh(radbin(s), s + '.csh'))
92 +
93 + Default('#src/util')
94 + env.Install('$RAD_BINDIR', progs)
95  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines