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.15 by schorsch, Sat Mar 5 00:29:28 2016 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 > PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c
28 >        pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c
29 >        pmapdiag.c pmaptype.c''')
30  
31 < SURF = Split('''sphere.c source.c srcsupp.c virtuals.c o_face.c
32 <                srcsamp.c o_cone.c o_instance.c o_mesh.c''')
31 > SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
32 >                o_face.c o_cone.c o_instance.c o_mesh.c''')
33  
34   MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
35 <                m_direct.c m_mist.c fprism.c m_alias.c''') + [dielectric]
35 >                m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c ashikhmin.c '''
36 >                ) + [dielectric]
37  
38   MOD = Split('p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c')
39  
40   SUP = Split('func.c noise3.c data.c')
41  
42   # build libraries
43 < rsrc = RAY + SURF + MAT + MOD + SUP
44 < rlib = rt.Library(target=radlib('radiance'), source=rsrc)
43 > rsrc = RAY + PMAP + SURF + MAT + MOD + SUP
44 > env.Command('Version.c', 'VERSION', vstamp.build_version_c)
45 > env.Depends('Version.c', rsrc)
46 > Version = env.Object(source=['Version.c'])
47 > rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
48  
49 < if os.name == 'nt': # XXX until we get around fork() and friends
50 <        rcsrc = Split('raycalls.c')
51 < else: rcsrc = Split('raycalls.c raypcalls.c')
52 < rclib = rt.Library(target=radlib('raycalls'), source=rcsrc)
49 > #if os.name == 'nt': # XXX until we get around fork() and friends
50 > #       rcsrc = Split('raycalls.c')
51 > #else: rcsrc = Split('raycalls.c raypcalls.c')
52 > rcsrc = Split('raycalls.c $RAD_PCALLS')
53 > rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
54   Default(rclib)
55  
56 + fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
57 +        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
58   # build executables
59 < lasrc = Split('lookamb.c ambio.c')
60 < lookamb = rt.Program(target=radbin('lookamb'), source=lasrc)
59 > lasrc = ['lookamb.c', ambio]
60 > lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
61 >        LIBS=['rtio', 'rtpic', 'rtmath', mlib])
62   Default(lookamb)
63 < env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], lookamb)])
63 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
64  
65 < if os.name != 'nt': # XXX pending resolution of the free_os() conflict
66 <        rtmain = rt.Object(source='rtmain.c',
67 <                        CCFLAGS=rt['CCFLAGS'] + ['-DNICE=4'])
68 <        rtsrc = Split('rtrace.c duphead.c persist.c') + [rtmain, rlib]
69 <        rtrace = rt.Program(target=radbin('rtrace'), source=rtsrc,)
70 <        Default(rtrace)
71 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rtrace)])
65 > rcontrib = env.Program(target=radbin('rcontrib'),
66 >                source = Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
67 >                LIBS= ['rttrace','rtscene','rtpic','rtargs','rtfunc','rtio',
68 >                'rtproc','rtcont',
69 >                'rtmem', 'rtpath', 'rtmath','rtnet','rterror','$RAD_SOCKETLIB',mlib]),
70 > Default(rcontrib)
71 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rcontrib)])
72  
56        rpsrc = Split('rpmain.c rpict.c srcdraw.c duphead.c persist.c') + [rlib]
57        rpict = rt.Program(target=radbin('rpict'), source=rpsrc,)
58        Default(rpict)
59        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rpict)])
73  
74 < if rt.has_key('X11LIB'): # lots of special requirements for rview
75 <        x11incls = [rt['X11INCLUDE']] + rt['CPPPATH']
76 <        x11 = rt.Object(source='x11.c', CPPPATH=x11incls)
77 <        x11twind = rt.Object(source='x11twind.c', CPPPATH=x11incls)
78 <        rvmain = rt.Object(source='rvmain.c',
79 <                CCFLAGS=rt['CCFLAGS'] + ['-DNICE=6'])
80 <        rv3 = rt.Object(source='rv3.c', # XXX we should get rid of SPEED
81 <                CCFLAGS=rt['CCFLAGS'] + [rt.get('RAD_SPEED', '')])
74 > rtmain = env.Object(source=['rtmain.c'],
75 >                CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
76 > rtsrc = ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls]
77 > rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
78 >        LIBS=fullib + ['rtnet'] +  mlib
79 >        )
80 > Default(rtrace)
81 > env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
82  
83 + rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
84 + rpict = env.Program(target=radbin('rpict'), source=rpsrc,
85 +        LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
86 + Default(rpict)
87 + env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
88 +
89 + if env.has_key('X11LIB'): # lots of special requirements for rvu
90 +        x11incls = [env['X11INCLUDE']] + env['CPPPATH']
91 +        x11 = env.Object(source='x11.c', CPPPATH=x11incls)
92 +        x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
93 +        rvmain = env.Object(source='rvmain.c',
94 +                CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
95 +        rv3 = env.Object(source='rv3.c',
96 +                CCFLAGS=env['CCFLAGS']
97 +                )
98 +
99          devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
100          rvobjs = [x11, x11twind, rv3, rvmain, rlib]
101          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
102 <        rview = rt.Program(target=radbin('rview'), source=rvsrc,
103 <                LIBPATH=rt['LIBPATH'] + [rt['X11LIB']],
104 <                LIBS=rt['LIBS'] + ['X11'])
105 <        Default(rview)
106 <        env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rview)])
102 >        rvu = env.Program(target=radbin('rvu'), source=rvsrc,
103 >                LIBPATH=env['LIBPATH'] + [env['X11LIB']],
104 >                LIBS = (['rtscene', rclib, 'rttrace', 'rtnet', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
105 >                        'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror',
106 >                        'X11'] + mlib)
107 >                #LIBS=fullib + ['X11', rclib] + mlib
108 >                )
109 >        Default(rvu)
110 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
111  
112   LIBFILES = Split('rayinit.cal')
113 < env.Append(RAD_RLIBINSTALL=[rt.Install(rt['RAD_RLIBDIR'], LIBFILES)])
113 > env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
114  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines