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

Comparing ray/src/hd/SConscript (file contents):
Revision 1.5 by schorsch, Mon Sep 19 12:37:46 2005 UTC vs.
Revision 1.7 by schorsch, Tue Dec 23 15:04:00 2008 UTC

# Line 17 | Line 17 | Version = env.Object(source='../rt/Version.c') # XXX .
17   PROGS = (
18   ('rholo', Split('''rholo.c rholo2.c rholo2l.c rholo3.c rholo4.c''')
19           + [Version, holofile, holo, viewbeams],
20 <        ['rtpic','rtio','rtproc','rtpath','rtargs','rtmath','rtmem','rterror']),
20 >        ['rtpic','rtproc','rtpath','rtio','rtargs','rtmath','rtmem','rterror']),
21   ('rhpict', Split('rhpict.c rhpict2.c')+[Version, holofile, holo, viewbeams],
22 <        ['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
22 >        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
23   ('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
24 <        ['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
24 >        ['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
25   ('rhinfo', Split('rhinfo.c') + [holofile, holo],
26          ['rtio','rtproc', 'rtmath','rterror']),
27   ('rhoptimize', Split('rhoptimize.c') + [clumpbeams, holofile, holo],
# Line 38 | Line 38 | if os.name != 'nt': # pending some major work...
38  
39   # display drivers
40   if env.has_key('X11INCLUDE'):
41 <        xenv = env.Copy(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
41 >        xenv = env.Clone(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
42                          LIBPATH=[env['X11LIB']] + env['LIBPATH'],)
43          # common objects
44          rhdisp = xenv.Object(source='rhdisp.c')
# Line 53 | Line 53 | if env.has_key('X11INCLUDE'):
53          # XXX the .hdi extension will cause problems on Windows
54          xenv['PROGSUFFIX'] = '.hdi'
55  
56 <        dlibs = ['rtpic','rtio','rtmath','rtcont','rtmem','rtargs','rterror']
56 >        dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','rterror','rtdummy']
57          def make_hdi(p): # build them
58                  obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
59                  prog = xenv.Program(target=os.path.join(devdir, p[0]),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines