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

Comparing ray/src/util/SConscript (file contents):
Revision 1.13 by schorsch, Mon Sep 19 12:59:49 2005 UTC vs.
Revision 1.14 by schorsch, Mon Apr 21 07:31:30 2008 UTC

# Line 15 | Line 15 | Version = env.Object(source='../rt/Version.c') # XXX .
15   PROGS = [
16   ('findglare', Split('findglare.c glareval.c glaresrc.c setscan.c'),
17          ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem','rterror']),
18 < ('glarendx',  Split('glarendx.c'), ['rtpic','rtio','rtargs','rtmath']),
19 < ('vwright',   Split('vwright.c'),  ['rtpic','rtio','rtargs','rtmath']),
20 < ('vwrays',    Split('vwrays.c'),   ['rtpic','rtio','rtargs','rtmath']),
18 > ('glarendx',  Split('glarendx.c'), ['rtpic','rtargs','rtio','rtmath']),
19 > ('vwright',   Split('vwright.c'),  ['rtpic','rtargs','rtio','rtmath']),
20 > ('vwrays',    Split('vwrays.c'),   ['rtpic','rtargs','rtio','rtmath']),
21   ('rad',       Split('rad.c'),
22 <        ['rtpic','rtproc','rtpath','rtio','rtmath','rtargs','rtcont','rtmem','rterror']),
22 >        ['rtpic','rtproc','rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']),
23   ('rpiece',    Split('rpiece.c') + [Version],
24          ['rtpic','rtargs','rtio','rtproc','rtmath','rtpath','rtmem']),
25   ('ranimate',  ['ranimate.c', '$RAD_NETCOMPAT'],
# Line 34 | Line 34 | for p in PROGS:
34          prog = env.Program(target=radbin(p[0]), source=p[1], LIBS=p[2]+mlib)
35          progs.append(prog)
36  
37 < if os.name != 'nt': # XXX pending Windows version of raypcalls.c
37 > #if os.name != 'nt': # XXX pending Windows version of raypcalls.c
38 > if True: # experimental raypwin.c
39          # targets with different includes/libs
40          rs = Split('ranimove.c ranimove1.c ranimove2.c')
41          ranimove = env.Program(target=radbin('ranimove'), source=rs,
42                          CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
43 <                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
44 <                        'rtmath','rtcont','rtmem','rtargs','rtproc','rtpath','rterror'] + mlib)
43 >                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
44 >                        'rtcont','rtmem','rtargs','rtio','rtproc','rtpath','rterror']
45 >                        + mlib)
46          progs.append(ranimove)
47 +        rsensor = env.Program(target=radbin('rsensor'), source='rsensor.c',
48 +                        CPPPATH=env.get('CPPPATH', [])+ ['#src/rt'],
49 +                        LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtmath',
50 +                        'rtcont','rtmem','rtargs','rtio','rtpath','rterror','rtproc',
51 +                        'rtlamps'] + mlib)
52 +        progs.append(rsensor)
53  
54   getinfo = env.Program(target=radbin('getinfo'), source='getinfo.c',
55                  LIBS=['rtio'])
# Line 65 | Line 73 | if env.has_key('X11LIB'):
73                  glrad = env.Program(target=radbin('glrad'), source=Split('glrad.c'),
74                          CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
75                          LIBPATH=xlibp, CPPPATH=xincl,
76 <                        LIBS=['rgl','rtpic','rtscene','rtio','rtproc','rtpath','rtargs',
76 >                        LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
77                          'rtmath','rtcont','rtmem','rterror',
78                          'GL', 'GLU','X11'],)
79                  progs.append(glrad)

Diff Legend

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