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.14 by greg, Fri Apr 15 21:52:16 2011 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 + 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
25 < RAY = Split('''ambcomp.c ambient.c ambio.c freeobjmem.c
26 <                initotypes.c preload.c raytrace.c renderopts.c Version.c''')
25 > RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
26 >                raytrace.c renderopts.c''') + [ambio]
27  
28 < SURF = Split('''sphere.c source.c srcsupp.c virtuals.c o_face.c
29 <                srcsamp.c o_cone.c o_instance.c o_mesh.c''')
28 > SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
29 >                o_face.c o_cone.c o_instance.c o_mesh.c''')
30  
31   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
32 <                m_direct.c m_mist.c fprism.c m_alias.c''') + [dielectric]
32 >                m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c''') + [dielectric]
33  
34   MOD = Split('p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c')
35  
# Line 31 | Line 37 | SUP = Split('func.c noise3.c data.c')
37  
38   # build libraries
39   rsrc = RAY + SURF + MAT + MOD + SUP
40 < rlib = rt.Library(target=radlib('radiance'), source=rsrc)
40 > env.Command('Version.c', 'VERSION', vstamp.build_version_c)
41 > 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')
48 < rclib = rt.Library(target=radlib('raycalls'), source=rcsrc)
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', 'rtmath',
53 +        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
54   # build executables
55 < lasrc = Split('lookamb.c ambio.c')
56 < lookamb = rt.Program(target=radbin('lookamb'), source=lasrc)
55 > lasrc = ['lookamb.c', ambio]
56 > lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
57 >        LIBS=['rtio', 'rtpic'])
58   Default(lookamb)
59 < env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], lookamb)])
59 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
60  
61 < if os.name != 'nt': # XXX pending resolution of the free_os() conflict
62 <        rtmain = rt.Object(source='rtmain.c',
63 <                        CCFLAGS=rt['CCFLAGS'] + ['-DNICE=4'])
64 <        rtsrc = Split('rtrace.c duphead.c persist.c') + [rtmain, rlib]
65 <        rtrace = rt.Program(target=radbin('rtrace'), source=rtsrc,)
66 <        Default(rtrace)
67 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rtrace)])
61 > rtmain = env.Object(source=['rtmain.c'],
62 >                CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
63 > rtsrc = ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls]
64 > rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
65 >        LIBS=fullib + mlib
66 >        )
67 > Default(rtrace)
68 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
69  
70 <        rpsrc = Split('rpmain.c rpict.c srcdraw.c duphead.c persist.c') + [rlib]
71 <        rpict = rt.Program(target=radbin('rpict'), source=rpsrc,)
72 <        Default(rpict)
73 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rpict)])
70 > rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
71 > rpict = env.Program(target=radbin('rpict'), source=rpsrc,
72 >        LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
73 > Default(rpict)
74 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
75  
76 < if rt.has_key('X11LIB'): # lots of special requirements for rview
77 <        x11incls = [rt['X11INCLUDE']] + rt['CPPPATH']
78 <        x11 = rt.Object(source='x11.c', CPPPATH=x11incls)
79 <        x11twind = rt.Object(source='x11twind.c', CPPPATH=x11incls)
80 <        rvmain = rt.Object(source='rvmain.c',
81 <                CCFLAGS=rt['CCFLAGS'] + ['-DNICE=6'])
82 <        rv3 = rt.Object(source='rv3.c', # XXX we should get rid of SPEED
83 <                CCFLAGS=rt['CCFLAGS'] + [rt.get('RAD_SPEED', '')])
76 > if env.has_key('X11LIB'): # lots of special requirements for rvu
77 >        x11incls = [env['X11INCLUDE']] + env['CPPPATH']
78 >        x11 = env.Object(source='x11.c', CPPPATH=x11incls)
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',
83 >                CCFLAGS=env['CCFLAGS']
84 >                )
85  
86          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
87          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
88          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
89 <        rview = rt.Program(target=radbin('rview'), source=rvsrc,
90 <                LIBPATH=rt['LIBPATH'] + [rt['X11LIB']],
91 <                LIBS=rt['LIBS'] + ['X11'])
92 <        Default(rview)
93 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rview)])
89 >        rvu = env.Program(target=radbin('rvu'), source=rvsrc,
90 >                LIBPATH=env['LIBPATH'] + [env['X11LIB']],
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  
99   LIBFILES = Split('rayinit.cal')
100 < env.Append(RAD_RLIBINSTALL=[rt.Install(rt['RAD_RLIBDIR'], LIBFILES)])
100 > env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
101  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines