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.23 by schorsch, Mon Jan 8 13:38:37 2018 UTC

# Line 1 | Line 1
1 + from __future__ import division, print_function, unicode_literals
2 +
3   import os
4  
5   Import('env') # inherit from parent
# Line 54 | Line 56 | progs.append(getinfo)
56  
57   # X11 targets
58   if env.has_key('X11LIB'):
59 +        addobj = env.get('ADDOBJNOTIFY')
60          xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
61          xlibp = env.get('LIBPATH', []) + ['$X11LIB']
62          xglaresrc = env.Program(target=radbin('xglaresrc'),
# Line 64 | Line 67 | if env.has_key('X11LIB'):
67  
68          # OpenGL targets that also depend on X11
69          if env.has_key('OGL'):
70 <                glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
71 <                        CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
72 <                        LIBPATH=xlibp, CPPPATH=xincl,
73 <                        LIBS=['rgl','rtrad','rtdummy', 'GL', 'GLU','X11'] + mlib,)
70 >                glrad = env.Program(target=radbin('glrad'),
71 >                                source=['glrad.c', addobj],
72 >                                CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
73 >                                LIBPATH=xlibp, CPPPATH=xincl,
74 >                                LIBS=['rgl','rtrad','GL', 'GLU','X11'] + mlib,)
75                  progs.append(glrad)
76  
77 < if os.name == 'posix': # XXX ignoring trad.wsh
77 > pyscripts = Split('''rlux''')
78 > if os.name == 'posix':
79          for s in Split('''objline glare dayfact
80 <                        debugcal rlux raddepend compamb vinfo fieldcomb'''):
80 >                        debugcal raddepend compamb vinfo fieldcomb'''):
81                  Default(env.InstallScript(radbin(s), s + '.csh'))
82          for s in Split('''objview objpict
83 <                        genambpos genklemsamp genskyvec genBSDF ltview ltpict'''):
83 >                        genambpos genklemsamp genskyvec genBSDF bsdfview ltview ltpict'''):
84                  Default(env.InstallScript(radbin(s), s + '.pl'))
85          for s in Split('''do_action.tcl do_file.tcl do_options.tcl do_results.tcl
86                  do_scene.tcl do_views.tcl do_zone.tcl file.hlp getfile.tcl gethelp.tcl
87                  help.hlp tclIndex trad.hlp trad.icon util.tcl'''):
88                  Default(env.InstallScript(tclscr(s), s))
89          Default(env.InstallTCLScript(radbin('trad'), 'trad.wsh'))
90 +        for s in pyscripts:
91 +                Default(env.InstallScript(radbin(s), s + '.py'))
92 + else:
93 +        for s in pyscripts:
94 +                Default(env.InstallScript(radbin(s + '.py'), s + '.py'))
95          
86 # Those don't really work yet
87 #else:
88 #       for s in Split('''objview glare rlux '''):
89 #               prog = env.Program(target=radbin(s), source=s+'.c')
90 #               progs.append(prog)
96  
97   Default('#src/util')
98   env.Install('$RAD_BINDIR', progs)
99  
100   # vim: set syntax=python:
101 + # vi: set ts=4 sw=4 :

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines