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.21 by schorsch, Thu Mar 10 21:43:23 2016 UTC vs.
Revision 1.22 by schorsch, Sat Mar 19 12:53:19 2016 UTC

# Line 54 | Line 54 | progs.append(getinfo)
54  
55   # X11 targets
56   if env.has_key('X11LIB'):
57 +        addobj = env.get('ADDOBJNOTIFY')
58          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
59          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
60          xglaresrc = env.Program(target=radbin('xglaresrc'),
# Line 64 | Line 65 | if env.has_key('X11LIB'):
65  
66          # OpenGL targets that also depend on X11
67          if env.has_key('OGL'):
68 <                glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
69 <                        CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
70 <                        LIBPATH=xlibp, CPPPATH=xincl,
71 <                        LIBS=['rgl','rtrad','rtdummy', 'GL', 'GLU','X11'] + mlib,)
68 >                glrad = env.Program(target=radbin('glrad'),
69 >                                source=['glrad.c', addobj],
70 >                                CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
71 >                                LIBPATH=xlibp, CPPPATH=xincl,
72 >                                LIBS=['rgl','rtrad','GL', 'GLU','X11'] + mlib,)
73                  progs.append(glrad)
74  
75   if os.name == 'posix': # XXX ignoring trad.wsh

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines