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.15 by schorsch, Thu Apr 24 10:28:25 2008 UTC vs.
Revision 1.16 by schorsch, Tue Dec 23 15:04:01 2008 UTC

# Line 60 | Line 60 | progs.append(getinfo)
60   if env.has_key('X11LIB'):
61          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
62          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
63        x11findwind = env.Object(source='#src/common/x11findwind.c', 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 73 | Line 72 | if env.has_key('X11LIB'):
72                          CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
73                          LIBPATH=xlibp, CPPPATH=xincl,
74                          LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
75 <                        'rtmath','rtcont','rtmem','rterror',
75 >                        'rtmath','rtcont','rtmem','rterror','rtdummy',
76                          'GL', 'GLU','X11'],)
77                  progs.append(glrad)
78  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines