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.6 by schorsch, Tue Jul 6 11:49:10 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 = env['RAD_MLIB']
6  
7   # compose paths
8   def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
9   def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
10  
11 + setscan = env.Object(source='setscan.c')
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],
17 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
18 > #('contour',   Split('contour.c'),  ['rtmath']), # XXX what is this?
19 > ('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
20 > ('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
21 > ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
22 > ('rad',       Split('rad.c'),
23 >        ['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
24 > ('rpiece',    Split('rpiece.c') + [Version],
25 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
26   ]
27 < if os.name != 'nt': # XXX pending Windows version of netproc.c
28 <        PROGS.append(('ranimate',  Split('ranimate.c netproc.c')))
27 > if os.name == 'nt': # XXX should be set in a *.cfg file
28 >        netproc = 'win_netproc.c'
29 >        netlib = ['ws2_32']
30 > else:
31 >        netproc = 'netproc.c'
32 >        netlib = []
33 >
34 > PROGS.append(('ranimate',  ['ranimate.c', netproc],
35 >        ['rtpic','rtargs','rtio','rtcont','rtmem','rtpath','rtmath','rtnet','rterror'] + netlib))
36   for p in PROGS:
37 <    prog = util.Program(target=radbin(p[0]), source=p[1])
38 <    Default(prog)
39 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], prog)])
37 >        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
38 >        Default(prog)
39 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], 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'])
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          Default(ranimove)
49 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], ranimove)])
49 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ranimove)])
50  
51 < getinfo = util.Program(target=radbin('getinfo'), source='getinfo.c',
52 <                LIBS=['rt'])
51 > getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
52 >                LIBS=['rtio'])
53   Default(getinfo)
54 < env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], getinfo)])
54 > env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], getinfo)])
55  
56   # special targets not normally built
57 < scanner = util.Program(target=radbin('scanner'), source='scanner.c', LIBS=['m'])
58 < makedist = util.Program(target=radbin('makedist'),
59 <                source=Split('makedist.c setscan.c'))
60 < scanner_i = util.Install(util['RAD_BINDIR'], scanner)
61 < makedist_i = util.Install(util['RAD_BINDIR'], makedist)
62 < util.Alias('util_special', [scanner, makedist])
63 < util.Alias('util_special_install', [scanner_i, makedist_i])
57 > if os.name != 'nt': # XXX pending replacement of fork() and friends
58 >        scanner = env.Program(target=radbin('scanner'), source='scanner.c',
59 >                        LIBS=mlib)
60 >        scanner_i = env.Install(env['RAD_BINDIR'], scanner)
61 >        makedist = env.Program(target=radbin('makedist'),
62 >                        source=Split('makedist.c')+[setscan],
63 >                        LIBS=['rtmath']+mlib)
64 >        makedist_i = env.Install(env['RAD_BINDIR'], makedist)
65 >        env.Alias('util_special', [scanner, makedist])
66 >        env.Alias('util_special_install', [scanner_i, makedist_i])
67  
68   # X11 targets
69 < if util.has_key('X11LIB'):
70 <    util.Append(CPPPATH=util['X11INCLUDE'])
71 <    util.Append(LIBS='X11')
72 <    util.Append(LIBPATH=util['X11LIB'])
73 <    xglaresrc = util.Program(target=radbin('xglaresrc'),
74 <                        source=Split('xglaresrc.c x11findwind.c'),)
75 <    Default(xglaresrc)
76 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], xglaresrc)])
69 > if env.has_key('X11LIB'):
70 >        xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
71 >        xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
72 >        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
73 >                        CPPPATH=xincl)
74 >        xglaresrc = env.Program(target=radbin('xglaresrc'),
75 >                        source=Split('xglaresrc.c') + [x11findwind],
76 >                        LIBPATH=xlibp, CPPPATH=xincl,
77 >                        LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
78 >        Default(xglaresrc)
79 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xglaresrc)])
80  
81 <    # OpenGL targets that also depend on X11
82 <    if util.has_key('OGL'):
83 <        glrad = util.Program(target=radbin('glrad'), source=Split('glrad.c'),
84 <            CPPFLAGS=util.get('CPPFLAGS', []) + [util['RAD_STEREO']],
85 <            LIBS=['rgl', 'GL', 'GLU']+util['LIBS'],)
86 <        Default(glrad)
87 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], glrad)])
81 >        # OpenGL targets that also depend on X11
82 >        if env.has_key('OGL'):
83 >                glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
84 >                        CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']],
85 >                        LIBPATH=xlibp, CPPPATH=xincl,
86 >                        LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
87 >                        'rtmath','rtcont','rtmem','rterror',
88 >                        'GL', 'GLU','X11'],)
89 >                Default(glrad)
90 >                env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], glrad)])
91  
92  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines