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.12 by schorsch, Mon Sep 19 11:30:11 2005 UTC vs.
Revision 1.18 by greg, Wed Dec 15 01:40:11 2010 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 < 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.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']),
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'],
# Line 27 | Line 27 | PROGS = [
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'])
30 >        'rtmath','rtnet','rterror','$RAD_SOCKETLIB']),
31 > ('dctimestep', ['dctimestep.c'],
32 >        ['rtall'])
33   ]
34  
35   for p in PROGS:
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 Windows version of raypcalls.c
39 > #if os.name != 'nt': # XXX pending Windows version of raypcalls.c
40 > if True: # experimental raypwin.c
41          # targets with different includes/libs
42          rs = Split('ranimove.c ranimove1.c ranimove2.c')
43          ranimove = env.Program(target=radbin('ranimove'), source=rs,
44                          CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
45 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
46 <                        'rtmath','rtcont','rtmem','rtargs','rtproc','rtpath','rterror'] + mlib)
45 >                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
46 >                        'rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
47 >                        + mlib)
48          progs.append(ranimove)
49 +        rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
50 +                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
51 +                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
52 +                        'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
53 +                        'rtlamps'] + mlib)
54 +        progs.append(rsensor)
55  
56   getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
57                  LIBS=['rtio'])
# Line 52 | Line 62 | progs.append(getinfo)
62   if env.has_key('X11LIB'):
63          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
64          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
55        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
56                        CPPPATH=xincl)
65          xglaresrc = env.Program(target=radbin('xglaresrc'),
66 <                        source=Split('xglaresrc.c') + [x11findwind],
66 >                        source=Split('xglaresrc.c') + [env.x11findwind], # XXX remote magic
67                          LIBPATH=xlibp, CPPPATH=xincl,
68                          LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
69          progs.append(xglaresrc)
# Line 65 | Line 73 | if env.has_key('X11LIB'):
73                  glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
74                          CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
75                          LIBPATH=xlibp, CPPPATH=xincl,
76 <                        LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
77 <                        'rtmath','rtcont','rtmem','rterror',
76 >                        LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
77 >                        'rtmath','rtcont','rtmem','rterror','rtdummy',
78                          'GL', 'GLU','X11'],)
79                  progs.append(glrad)
80  
81   if os.name == 'posix': # XXX ignoring trad.wsh
82 <        for s in Split('''objview objline objpict
83 <                        glare dayfact debugcal rlux raddepend compamb vinfo genambpos'''):
82 >        for s in Split('''objview objline objpict glare dayfact
83 >                        debugcal rlux raddepend compamb vinfo genambpos fieldcomb'''):
84                  Default(env.InstallCsh(radbin(s), s + '.csh'))
85   # Those don't really work yet
86   #else:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines