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.2 by schorsch, Mon Oct 27 10:35:43 2003 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 +
13   # standard targets
14   PROGS = [
15 < ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c')),
16 < ('glarendx',  Split('glarendx.c')),
17 < ('vwright',   Split('vwright.c')),
18 < ('vwrays',    Split('vwrays.c')),
19 < ('rad',       Split('rad.c')),
20 < ('rpiece',    Split('rpiece.c Version.c')),
15 > ('findglare', Split('findglare.c glareval.c glaresrc.c')+[setscan],
16 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
17 > ('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
18 > ('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
19 > ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
20 > ('rad',       Split('rad.c'),
21 >        ['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
22 > ('rpiece',    Split('rpiece.c Version.c'),
23 >        ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
24   ]
25 < if os.name != 'nt': # XXX pending Windows version of netproc.c
26 <        PROGS.append(('ranimate',  Split('ranimate.c netproc.c')))
25 > if os.name == 'nt': # XXX should be set in a *.cfg file
26 >        netproc = 'win_netproc.c'
27 >        netlib = ['ws2_32']
28 > else:
29 >        netproc = 'netproc.c'
30 >        netlib = []
31 >
32 > PROGS.append(('ranimate',  ['ranimate.c', netproc],
33 >        ['rtpic','rtargs','rtio','rtcont','rtmem','rtpath','rtmath','rtnet','rterror'] + netlib))
34   for p in PROGS:
35 <    prog = util.Program(target=radbin(p[0]), source=p[1])
36 <    Default(prog)
37 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], prog)])
35 >        prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
36 >        Default(prog)
37 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], 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'])
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          Default(ranimove)
47 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], ranimove)])
47 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ranimove)])
48  
49 < getinfo = util.Program(target=radbin('getinfo'), source='getinfo.c',
50 <                LIBS=['rt'])
49 > getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
50 >                LIBS=['rtio'])
51   Default(getinfo)
52 < env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], getinfo)])
52 > env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], 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(env['RAD_BINDIR'], scanner)
59 >        makedist = env.Program(target=radbin('makedist'),
60 >                        source=Split('makedist.c')+[setscan])
61 >        makedist_i = env.Install(env['RAD_BINDIR'], makedist)
62 >        env.Alias('util_special', [scanner, makedist])
63 >        env.Alias('util_special_install', [scanner_i, makedist_i])
64  
65   # X11 targets
66 < if util.has_key('X11LIB'):
67 <    util.Append(CPPPATH=util['X11INCLUDE'])
68 <    util.Append(LIBS='X11')
69 <    util.Append(LIBPATH=util['X11LIB'])
70 <    xglaresrc = util.Program(target=radbin('xglaresrc'),
71 <                        source=Split('xglaresrc.c x11findwind.c'),)
72 <    Default(xglaresrc)
73 <    env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], xglaresrc)])
66 > if env.has_key('X11LIB'):
67 >        xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
68 >        xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
69 >        xglaresrc = env.Program(target=radbin('xglaresrc'),
70 >                        source=Split('xglaresrc.c x11findwind.c'),
71 >                        LIBPATH=xlibp, CPPPATH=xincl,
72 >                        LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
73 >        Default(xglaresrc)
74 >        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xglaresrc)])
75  
76 <    # OpenGL targets that also depend on X11
77 <    if util.has_key('OGL'):
78 <        glrad = util.Program(target=radbin('glrad'), source=Split('glrad.c'),
79 <            CPPFLAGS=util.get('CPPFLAGS', []) + [util['RAD_STEREO']],
80 <            LIBS=['rgl', 'GL', 'GLU']+util['LIBS'],)
81 <        Default(glrad)
82 <        env.Append(RAD_BININSTALL=[util.Install(util['RAD_BINDIR'], glrad)])
76 >        # OpenGL targets that also depend on X11
77 >        if env.has_key('OGL'):
78 >                glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
79 >                        CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']],
80 >                        LIBPATH=xlibp, CPPPATH=xincl,
81 >                        LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
82 >                        'rtmath','rtcont','rtmem','rterror',
83 >                        'GL', 'GLU','X11'],)
84 >                Default(glrad)
85 >                env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], glrad)])
86  
87  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines