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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines