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

Diff Legend

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