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.2 by schorsch, Mon Oct 27 10:35:43 2003 UTC vs.
Revision 1.6 by schorsch, Tue Jul 6 11:49:10 2004 UTC

# Line 9 | Line 9 | def radbin(name): return os.path.join(env['RAD_BUILDBI
9   def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
10  
11   setscan = env.Object(source='setscan.c')
12 + Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
13  
14   # standard targets
15   PROGS = [
16   ('findglare', Split('findglare.c glareval.c glaresrc.c')+[setscan],
17          ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
18 + #('contour',   Split('contour.c'),  ['rtmath']), # XXX what is this?
19   ('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
20   ('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
21   ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
22   ('rad',       Split('rad.c'),
23          ['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
24 < ('rpiece',    Split('rpiece.c Version.c'),
24 > ('rpiece',    Split('rpiece.c') + [Version],
25          ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
26   ]
27   if os.name == 'nt': # XXX should be set in a *.cfg file
# Line 57 | Line 59 | if os.name != 'nt': # XXX pending replacement of fork(
59                          LIBS=mlib)
60          scanner_i = env.Install(env['RAD_BINDIR'], scanner)
61          makedist = env.Program(target=radbin('makedist'),
62 <                        source=Split('makedist.c')+[setscan])
62 >                        source=Split('makedist.c')+[setscan],
63 >                        LIBS=['rtmath']+mlib)
64          makedist_i = env.Install(env['RAD_BINDIR'], makedist)
65          env.Alias('util_special', [scanner, makedist])
66          env.Alias('util_special_install', [scanner_i, makedist_i])
# Line 66 | Line 69 | if os.name != 'nt': # XXX pending replacement of fork(
69   if env.has_key('X11LIB'):
70          xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
71          xincl = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
72 +        x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
73 +                        CPPPATH=xincl)
74          xglaresrc = env.Program(target=radbin('xglaresrc'),
75 <                        source=Split('xglaresrc.c x11findwind.c'),
75 >                        source=Split('xglaresrc.c') + [x11findwind],
76                          LIBPATH=xlibp, CPPPATH=xincl,
77                          LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
78          Default(xglaresrc)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines