ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/hd/SConscript
(Generate patch)

Comparing ray/src/hd/SConscript (file contents):
Revision 1.9 by schorsch, Thu Mar 10 01:49:56 2016 UTC vs.
Revision 1.10 by schorsch, Thu Mar 10 21:43:23 2016 UTC

# Line 18 | Line 18 | clumpbeams = env.Object(source='clumpbeams.c')
18   # standard targets
19   PROGS = (
20   ('rholo', Split('''rholo.c rholo2.c rholo2l.c rholo3.c rholo4.c''')
21 <         + [env.version, holofile, holo, viewbeams],
22 <        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror'],0),
21 >         + [env.version, holofile, holo, viewbeams], ['rtrad'],0),
22   ('rhpict', Split('rhpict.c rhpict2.c')+[env.version, holofile, holo, viewbeams],
23 <        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror'],1),
24 < ('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
25 <        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror'],1),
26 < ('rhinfo', Split('rhinfo.c') + [holofile, holo],
27 <        ['rtio','rtproc', 'rtmath','rterror'],1),
29 < ('rhoptimize', Split('rhoptimize.c') + [clumpbeams, holofile, holo],
30 <        ['rtio','rtproc', 'rtmath','rterror'],1),
31 < ('genrhgrid', Split('genrhgrid.c') + [holofile, holo],
32 < ['rtio','rtmath','rtproc','rterror'],1),
23 >        ['rtrad'],1),
24 > ('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo], ['rtrad'],1),
25 > ('rhinfo', Split('rhinfo.c') + [holofile, holo], ['rtrad'],1),
26 > ('rhoptimize', Split('rhoptimize.c') + [clumpbeams,holofile,holo], ['rtrad'],1),
27 > ('genrhgrid', Split('genrhgrid.c') + [holofile, holo], ['rtrad'],1),
28   )
29   if 1:
30          for p in PROGS:
# Line 57 | Line 52 | if env.has_key('X11INCLUDE'):
52          # XXX the .hdi extension will cause problems on Windows
53          xenv['PROGSUFFIX'] = '.hdi'
54  
55 <        dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror','rtdummy']
55 >        dlibs = ['rtrad', 'rtdummy']
56          def make_hdi(p): # build them
57                  obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
58                  prog = xenv.Program(target=radbin(p[0]),
# Line 78 | Line 73 | if env.has_key('X11INCLUDE'):
73                  make_hdi(p)
74  
75          if env.has_key('OGL'):
76 <                rgllibs = ['rgl','rtscene','rtpath']
76 >                rgllibs = ['rgl','rtrad']
77                  ogl_common_s = Split('rhd_odraw.c rhd_geom.c')
78                  ogl_common = map(lambda s:xenv.Object(source=s), ogl_common_s)
79                  rhdobj = xenv.Object(source='rhdobj.c')
# Line 96 | Line 91 | if env.has_key('X11INCLUDE'):
91  
92                          # ogloh
93                          ('oglo', [rhdobj] + ogl_common,
94 <                         rgllibs+['rtproc']+dlibs+['GLU','GL','X11'] + mlib,
94 >                         rgllibs+['rtrad']+dlibs+['GLU','GL','X11'] + mlib,
95                           'rhd_oglo', 'rhd_ogl.c', ['-DDOBJ', '-DNOSTEREO']),
96                          )
97                  for p in GLHDI:

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)