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

Comparing ray/src/rt/SConscript (file contents):
Revision 1.1 by schorsch, Tue Oct 21 19:27:29 2003 UTC vs.
Revision 1.10 by schorsch, Mon Apr 21 07:31:30 2008 UTC

# Line 1 | Line 1
1   import os
2 + from build_utils import vstamp
3  
4   Import('env') # inherit from parent
5  
6 < # create a modified local copy of the build environment
6 < rt = env.Copy(LIBS=env['RAD_MLIB'] + ['rt'])
6 > mlib = env['RAD_MLIB']
7  
8   # compose paths
9 < def radbin(name): return os.path.join(rt['RAD_BUILDBIN'], name)
10 < def radlib(name): return os.path.join(rt['RAD_BUILDLIB'], name)
9 > def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
10 > def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
11  
12   # custom compile flags
13 < dielectric = rt.Object(source='dielectric.c',
14 <                CCFLAGS=rt['CCFLAGS'] + ['-DDISPERSE'])
15 < # custom C file generation
16 < #rt.CFile(target='Version.c', source='VERSION', rt=build_radversion)
13 > dielectric = env.Object(source='dielectric.c',
14 >                CCFLAGS=env.get('CCFLAGS',[]) + ['-DDISPERSE'])
15  
16 + duphead = env.Object(source="duphead.c")
17 + persist = env.Object(source="persist.c")
18 + ambio = env.Object(source="ambio.c")
19 +
20 +
21   # source and object dependencies
22 < RAY = Split('''ambcomp.c ambient.c ambio.c freeobjmem.c
23 <                initotypes.c preload.c raytrace.c renderopts.c Version.c''')
22 > RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
23 >                raytrace.c renderopts.c''') + [ambio]
24  
25 < SURF = Split('''sphere.c source.c srcsupp.c virtuals.c o_face.c
26 <                srcsamp.c o_cone.c o_instance.c o_mesh.c''')
25 > SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
26 >                o_face.c o_cone.c o_instance.c o_mesh.c''')
27  
28   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
29                  m_direct.c m_mist.c fprism.c m_alias.c''') + [dielectric]
# Line 31 | Line 34 | SUP = Split('func.c noise3.c data.c')
34  
35   # build libraries
36   rsrc = RAY + SURF + MAT + MOD + SUP
37 < rlib = rt.Library(target=radlib('radiance'), source=rsrc)
37 > env.Command('Version.c', 'VERSION', vstamp.build_version_c)
38 > env.Depends('Version.c', rsrc)
39 > Version = env.Object(source=['Version.c'])
40 > rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
41  
42 < if os.name == 'nt': # XXX until we get around fork() and friends
43 <        rcsrc = Split('raycalls.c')
44 < else: rcsrc = Split('raycalls.c raypcalls.c')
45 < rclib = rt.Library(target=radlib('raycalls'), source=rcsrc)
42 > #if os.name == 'nt': # XXX until we get around fork() and friends
43 > #       rcsrc = Split('raycalls.c')
44 > #else: rcsrc = Split('raycalls.c raypcalls.c')
45 > rcsrc = Split('raycalls.c $RAD_PCALLS')
46 > rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
47   Default(rclib)
48  
49 + fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
50 +        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
51   # build executables
52 < lasrc = Split('lookamb.c ambio.c')
53 < lookamb = rt.Program(target=radbin('lookamb'), source=lasrc)
52 > lasrc = ['lookamb.c', ambio]
53 > lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
54 >        LIBS=['rtio', 'rtpic'])
55   Default(lookamb)
56 < env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], lookamb)])
56 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
57  
58 < if os.name != 'nt': # XXX pending resolution of the free_os() conflict
59 <        rtmain = rt.Object(source='rtmain.c',
60 <                        CCFLAGS=rt['CCFLAGS'] + ['-DNICE=4'])
61 <        rtsrc = Split('rtrace.c duphead.c persist.c') + [rtmain, rlib]
62 <        rtrace = rt.Program(target=radbin('rtrace'), source=rtsrc,)
63 <        Default(rtrace)
64 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rtrace)])
58 > rtmain = env.Object(source=['rtmain.c'],
59 >                CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
60 > rtsrc = ['rtrace.c', duphead, persist, rtmain]
61 > rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
62 >        LIBS=fullib + mlib
63 >        )
64 > Default(rtrace)
65 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
66  
67 <        rpsrc = Split('rpmain.c rpict.c srcdraw.c duphead.c persist.c') + [rlib]
68 <        rpict = rt.Program(target=radbin('rpict'), source=rpsrc,)
69 <        Default(rpict)
70 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rpict)])
67 > rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
68 > rpict = env.Program(target=radbin('rpict'), source=rpsrc,
69 >        LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
70 > Default(rpict)
71 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
72  
73 < if rt.has_key('X11LIB'): # lots of special requirements for rview
74 <        x11incls = [rt['X11INCLUDE']] + rt['CPPPATH']
75 <        x11 = rt.Object(source='x11.c', CPPPATH=x11incls)
76 <        x11twind = rt.Object(source='x11twind.c', CPPPATH=x11incls)
77 <        rvmain = rt.Object(source='rvmain.c',
78 <                CCFLAGS=rt['CCFLAGS'] + ['-DNICE=6'])
79 <        rv3 = rt.Object(source='rv3.c', # XXX we should get rid of SPEED
80 <                CCFLAGS=rt['CCFLAGS'] + [rt.get('RAD_SPEED', '')])
73 > if env.has_key('X11LIB'): # lots of special requirements for rvu
74 >        x11incls = [env['X11INCLUDE']] + env['CPPPATH']
75 >        x11 = env.Object(source='x11.c', CPPPATH=x11incls)
76 >        x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
77 >        rvmain = env.Object(source='rvmain.c',
78 >                CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
79 >        rv3 = env.Object(source='rv3.c',
80 >                CCFLAGS=env['CCFLAGS']
81 >                )
82  
83          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
84          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
85          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
86 <        rview = rt.Program(target=radbin('rview'), source=rvsrc,
87 <                LIBPATH=rt['LIBPATH'] + [rt['X11LIB']],
88 <                LIBS=rt['LIBS'] + ['X11'])
89 <        Default(rview)
90 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rview)])
86 >        rvu = env.Program(target=radbin('rvu'), source=rvsrc,
87 >                LIBPATH=env['LIBPATH'] + [env['X11LIB']],
88 >                LIBS=fullib + ['X11'] + mlib)
89 >        Default(rvu)
90 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
91  
92   LIBFILES = Split('rayinit.cal')
93 < env.Append(RAD_RLIBINSTALL=[rt.Install(rt['RAD_RLIBDIR'], LIBFILES)])
93 > env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
94  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines