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

Comparing ray/src/rt/SConscript (file contents):
Revision 1.7 by schorsch, Fri Nov 5 22:15:43 2004 UTC vs.
Revision 1.13 by greg, Wed Jun 2 15:58:30 2010 UTC

# Line 16 | Line 16 | dielectric = env.Object(source='dielectric.c',
16   duphead = env.Object(source="duphead.c")
17   persist = env.Object(source="persist.c")
18   ambio = env.Object(source="ambio.c")
19 + rayfifo = env.Object(source="rayfifo.c")
20 + raypwin = env.Object(source="raypwin.c")
21 + raycalls = env.Object(source="raycalls.c")
22  
23  
24   # source and object dependencies
# Line 39 | Line 42 | env.Depends('Version.c', rsrc)
42   Version = env.Object(source=['Version.c'])
43   rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
44  
45 < if os.name == 'nt': # XXX until we get around fork() and friends
46 <        rcsrc = Split('raycalls.c')
47 < else: rcsrc = Split('raycalls.c raypcalls.c')
45 > #if os.name == 'nt': # XXX until we get around fork() and friends
46 > #       rcsrc = Split('raycalls.c')
47 > #else: rcsrc = Split('raycalls.c raypcalls.c')
48 > rcsrc = Split('raycalls.c $RAD_PCALLS')
49   rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
50   Default(rclib)
51  
52 < fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtio', 'rtmath',
53 <        'rtargs', 'rtpath', 'rtcont', 'rtmem', 'rterror']
52 > fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
53 >        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
54   # build executables
55   lasrc = ['lookamb.c', ambio]
56   lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
# Line 56 | Line 60 | env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR',
60  
61   rtmain = env.Object(source=['rtmain.c'],
62                  CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
63 < rtsrc = ['rtrace.c', duphead, persist, rtmain]
63 > rtsrc = ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls]
64   rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
65          LIBS=fullib + mlib
66          )
# Line 65 | Line 69 | env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR',
69  
70   rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
71   rpict = env.Program(target=radbin('rpict'), source=rpsrc,
72 <        LIBS=fullib+['rtnet']+mlib)
72 >        LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
73   Default(rpict)
74   env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
75  
# Line 75 | Line 79 | if env.has_key('X11LIB'): # lots of special requiremen
79          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
80          rvmain = env.Object(source='rvmain.c',
81                  CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
82 <        rv3 = env.Object(source='rv3.c', # XXX we should get rid of SPEED
83 <                CCFLAGS=env['CCFLAGS'] + ['$RAD_SPEED']
82 >        rv3 = env.Object(source='rv3.c',
83 >                CCFLAGS=env['CCFLAGS']
84                  )
85  
86          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
# Line 84 | Line 88 | if env.has_key('X11LIB'): # lots of special requiremen
88          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
89          rvu = env.Program(target=radbin('rvu'), source=rvsrc,
90                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
91 <                LIBS=fullib + ['X11'] + mlib)
91 >                LIBS = (['rtscene', rclib, 'rttrace', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
92 >                        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror',
93 >                        'X11'] + mlib)
94 >                #LIBS=fullib + ['X11', rclib] + mlib
95 >                )
96          Default(rvu)
97          env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
98  

Diff Legend

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