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.2 by schorsch, Mon Oct 27 10:35:43 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines