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.14 by schorsch, Mon Apr 21 07:31:30 2008 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 = [
# 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:
# Line 60 | Line 62 | progs.append(getinfo)
62   if env.has_key('X11LIB'):
63          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
64          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
63        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
64                        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 74 | Line 74 | if env.has_key('X11LIB'):
74                          CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
75                          LIBPATH=xlibp, CPPPATH=xincl,
76                          LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
77 <                        'rtmath','rtcont','rtmem','rterror',
77 >                        'rtmath','rtcont','rtmem','rterror','rtdummy',
78                          'GL', 'GLU','X11'],)
79                  progs.append(glrad)
80  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines