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

Comparing ray/src/px/SConscript (file contents):
Revision 1.6 by schorsch, Tue Jul 6 11:49:09 2004 UTC vs.
Revision 1.8 by schorsch, Sat Oct 23 18:55:52 2004 UTC

# Line 2 | Line 2 | import os
2  
3   Import('env') # inherit from parent
4  
5 < mlib = env['RAD_MLIB']
5 > mlib = ['$RAD_MLIB']
6 > progs = []
7  
8   # compose paths
9 < def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
10 < def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
9 > def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
10 > #def radbin(name): return name
11 > def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
12  
13   warp3d = env.Object(source="warp3d.c")
14   clrtab = env.Object(source="clrtab.c")
# Line 48 | Line 50 | PROGS = (
50   ('ra_avs',   ['ra_avs.c'],    ['rtpic','rtio','rtmem']),
51   ('ra_ps',    ['ra_ps.c'],     ['rtpic','rtio','rtargs','rtmem']),
52   ('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
53 < ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtio','rtmem']),
53 > ('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtproc','rtio','rtmem']),
54   ('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
55   ('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
56   ('ra_bn',    ['ra_bn.c'],     ['rtpic','rtio','rtmem']),
# Line 61 | Line 63 | PROGS = (
63   )
64   for p in PROGS:
65      prog = env.Program(target=radbin(p[0]), source=p[1],
66 <                LIBS=p[2]+mlib)
67 <    Default(prog)
66 <    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
66 >        LIBS=p[2]+mlib)
67 >    progs.append(prog)
68  
69  
70   # special targets not normally built
# Line 87 | Line 88 | specinst = []
88   for p in SPECIAL:
89          prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
90          specprogs.append(prog)
91 <        specinst.append(env.Install(env['RAD_BINDIR'], prog))
91 >        specinst.append(env.Install('$RAD_BINDIR', prog))
92   env.Alias('px_special', specprogs)
93   env.Alias('px_special_install', specinst)
94  
# Line 106 | Line 107 | if os.name == 'posix':
107          # tiff programs
108          ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
109                  LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
110 <        Default(ra_tiff)
110 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_tiff)])
110 >        progs.append(ra_tiff)
111  
112          normtiff = env.Program(target=radbin('normtiff'), source=Split('normtiff.c'),
113                  LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
114 <        Default(normtiff)
115 <        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], normtiff)])
114 >        progs.append(normtiff)
115  
116  
117   # pixar format requires extra lib
118   if env.has_key('PIXAR_LIB'):
119      ra_pixar = env.Program(radbin('ra_pixar'), source=['ra_pixar.c'],
120 <        LIBS=['rtpic', env['PIXAR_LIB']])
121 <    Default(ra_pixar)
123 <    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)])
120 >        LIBS=['rtpic', '$PIXAR_LIB'])
121 >    progs.append(ra_pixar)
122  
123  
124   # X11 targets
125   if env.has_key('X11LIB'):
126 <    xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
127 <    xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
126 >    xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
127 >    xlibp = env.get('LIBPATH', []) + ['$X11LIB']
128      xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
129      x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
130 <                CPPPATH=xincl)
130 >        CPPPATH=xincl)
131  
132      ximage = env.Program(target=radbin('ximage'),
133          source=Split('x11image.c x11raster.c')+[clrtab],
134          CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
135 <    Default(ximage)
138 <    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
135 >    progs.append(ximage)
136  
137      xshowtrace = env.Program(target=radbin('xshowtrace'),
138          source=Split('xshowtrace.c') + [x11findwind],
139          CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
140 <    Default(xshowtrace)
144 <    env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])
140 >    progs.append(xshowtrace)
141  
142   # NeWS ?!?
143   #    if env.has_key('OGL'):
# Line 149 | Line 145 | if env.has_key('X11LIB'):
145   #            CPPFLAGS=env.get('CPPFLAGS', []) + [env['RAD_STEREO']],
146   #            source=Split('glimage.c'),
147   #            LIBS=['gl_s']+env['LIBS'],)
148 < #        Default(glimage)
153 < #        env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], glimage)])
148 > #        progs.append(glimage)
149  
150 +
151 + if os.name == 'posix': # XXX ignoring trad.wsh
152 +        for s in Split('''normpat falsecolor pdfblur
153 +                        pmblur xyzimage phisto pdelta pgblur'''):
154 +                Default(env.InstallCsh(radbin(s), s + '.csh'))
155 + # XXX probably needs fixing
156 + #else:
157 + #       for s in Split('''falsecolor'''):
158 + #               Default(env.InstallCsh(radbin(s), s + '.csh'))
159 +
160 + Default('#src/px')
161 + env.Install('$RAD_BINDIR', progs)
162  

Diff Legend

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