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.16 by schorsch, Sat Mar 5 13:24:58 2016 UTC vs.
Revision 1.17 by schorsch, Thu Mar 10 21:43:23 2016 UTC

# Line 29 | Line 29 | RAY = Split('''ambcomp.c ambient.c freeobjmem.c initot
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
32   SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
33                  o_face.c o_cone.c o_instance.c o_mesh.c''')
35
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 m_bsdf.c ashikhmin.c '''
36                  ) + [dielectric]
39
37   MOD = Split('p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c')
41
38   SUP = Split('func.c noise3.c data.c')
39  
40   # build libraries
# Line 49 | Line 45 | Version = env.Object(source=['Version.c'])
45   env.version = Version # make it remotely accessible
46   rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
47  
48 < #if os.name == 'nt': # XXX until we get around fork() and friends
49 < #       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)
48 > rclib = env.Library(target=radlib('raycalls'),
49 >                source=Split('raycalls.c $RAD_PCALLS'))
50   Default(rclib)
51  
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', '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
52   rtmain = env.Object(source=['rtmain.c'],
53                  CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
92 rtsrc = ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls]
93 rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
94        LIBS=fullib + ['rtnet'] +  mlib
95        )
96 Default(rtrace)
97 env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
54  
55 < rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
56 < rpict = env.Program(target=radbin('rpict'), source=rpsrc,
57 <        LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
58 < Default(rpict)
59 < env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
55 > # build executables
56 > PROGS = [
57 > ('mkpmap',   ['mkpmap.c', Version],
58 >         ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
59 > ('pmapdump', ['pmapdump.c', pmaptype, pmapparm, Version],
60 >         ['rtrad', '$RAD_SOCKETLIB', mlib]),
61 > ('lookamb',  ['lookamb.c', ambio], ['rtrad', mlib]),
62 > ('rcontrib', Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
63 >         ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
64 > ('rtrace',   ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls],
65 >         ['rttrace', 'rtrad'] +  mlib),
66 > ('rpict',    Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist],
67 >         ['rttrace', 'rtrad', '$RAD_SOCKETLIB']+mlib),
68 > ]
69 > for p in PROGS:
70 >        prog = env.Program(target=radbin(p[0]), source = p[1], LIBS = p[2]),
71 >        Default(prog)
72 >        env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', prog)])
73  
74 +
75   if env.has_key('X11LIB'): # lots of special requirements for rvu
76          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
77          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
# Line 117 | Line 87 | if env.has_key('X11LIB'): # lots of special requiremen
87          rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
88          rvu = env.Program(target=radbin('rvu'), source=rvsrc,
89                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
90 <                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
90 >                LIBS = ([rclib, 'rttrace', 'rtrad', 'X11'] + mlib)
91                  )
92          Default(rvu)
93          env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines