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.9 by schorsch, Fri Nov 5 22:15:44 2004 UTC vs.
Revision 1.16 by schorsch, Tue Dec 23 15:04:01 2008 UTC

# Line 9 | Line 9 | progs = []
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
12 > Version = env.Object(source='#src/rt/Version.c')
13  
14   # standard targets
15   PROGS = [
16 < ('findglare', Split('findglare.c glareval.c glaresrc.c')+[setscan],
16 > ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'),
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']),
22 < ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
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','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
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   ]
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 = []
32  
35 PROGS.append(('ranimate',  ['ranimate.c', netproc],
36        ['rtpic','rtargs','rtio','rtcont','rtmem','rtpath','rtmath','rtnet','rterror'] + netlib))
33   for p in PROGS:
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 Windows version of raypcalls.c
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          ranimove = env.Program(target=radbin('ranimove'), source=rs,
42                          CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
43 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
44 <                        'rtmath','rtcont','rtmem','rtargs','rtproc','rtpath','rterror'] + mlib)
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 = env.Program(target=radbin('getinfo'), source='getinfo.c',
55                  LIBS=['rtio'])
# Line 56 | Line 60 | progs.append(getinfo)
60   if env.has_key('X11LIB'):
61          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
62          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
59        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
60                        CPPPATH=xincl)
63          xglaresrc = env.Program(target=radbin('xglaresrc'),
64 <                        source=Split('xglaresrc.c') + [x11findwind],
64 >                        source=Split('xglaresrc.c') + [env.x11findwind], # XXX remote magic
65                          LIBPATH=xlibp, CPPPATH=xincl,
66                          LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
67          progs.append(xglaresrc)
# Line 69 | Line 71 | if env.has_key('X11LIB'):
71                  glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
72                          CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
73                          LIBPATH=xlibp, CPPPATH=xincl,
74 <                        LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
75 <                        'rtmath','rtcont','rtmem','rterror',
74 >                        LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
75 >                        'rtmath','rtcont','rtmem','rterror','rtdummy',
76                          'GL', 'GLU','X11'],)
77                  progs.append(glrad)
78  
79   if os.name == 'posix': # XXX ignoring trad.wsh
80 <        for s in Split('''objview objline objpict
81 <                        glare dayfact debugcal rlux raddepend compamb vinfo genambpos'''):
80 >        for s in Split('''objview objline objpict glare dayfact
81 >                        debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
82                  Default(env.InstallCsh(radbin(s), s + '.csh'))
83   # Those don't really work yet
84   #else:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines