--- ray/src/rt/SConscript	2005/09/19 11:30:10	1.9
+++ ray/src/rt/SConscript	2016/03/05 00:29:28	1.15
@@ -16,49 +16,66 @@ dielectric = env.Object(source='dielectric.c',
 duphead = env.Object(source="duphead.c")
 persist = env.Object(source="persist.c")
 ambio = env.Object(source="ambio.c")
+rayfifo = env.Object(source="rayfifo.c")
+raypwin = env.Object(source="raypwin.c")
+raycalls = env.Object(source="raycalls.c")
 
 
 # source and object dependencies
 RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
 		raytrace.c renderopts.c''') + [ambio]
+PMAP = Split('''pmap.c pmapsrc.c pmapmat.c pmaprand.c pmapio.c pmapdata.c
+        pmapbias.c pmapparm.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c
+        pmapdiag.c pmaptype.c''')
 
 SURF = Split('''srcsamp.c srcsupp.c srcobstr.c source.c virtuals.c sphere.c
 		o_face.c o_cone.c o_instance.c o_mesh.c''')
 
 MAT = Split('''aniso.c normal.c m_clip.c glass.c m_brdf.c m_mirror.c
-		m_direct.c m_mist.c fprism.c m_alias.c''') + [dielectric]
+		m_direct.c m_mist.c fprism.c m_alias.c m_bsdf.c ashikhmin.c '''
+		) + [dielectric]
 
 MOD = Split('p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c')
 
 SUP = Split('func.c noise3.c data.c')
 
 # build libraries
-rsrc = RAY + SURF + MAT + MOD + SUP
+rsrc = RAY + PMAP + SURF + MAT + MOD + SUP
 env.Command('Version.c', 'VERSION', vstamp.build_version_c)
 env.Depends('Version.c', rsrc)
 Version = env.Object(source=['Version.c'])
 rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
 
-if os.name == 'nt': # XXX until we get around fork() and friends
-	rcsrc = Split('raycalls.c')
-else: rcsrc = Split('raycalls.c raypcalls.c')
+#if os.name == 'nt': # XXX until we get around fork() and friends
+#	rcsrc = Split('raycalls.c')
+#else: rcsrc = Split('raycalls.c raypcalls.c')
+rcsrc = Split('raycalls.c $RAD_PCALLS')
 rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
 Default(rclib)
 
-fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtio', 'rtmath',
-	'rtargs', 'rtpath', 'rtcont', 'rtmem', 'rterror']
+fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
+	'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
 # build executables
 lasrc = ['lookamb.c', ambio]
 lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
-	LIBS=['rtio', 'rtpic'])
+	LIBS=['rtio', 'rtpic', 'rtmath', mlib])
 Default(lookamb)
 env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
 
+rcontrib = env.Program(target=radbin('rcontrib'),
+		source = Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
+		LIBS= ['rttrace','rtscene','rtpic','rtargs','rtfunc','rtio',
+		'rtproc','rtcont',
+		'rtmem', 'rtpath', 'rtmath','rtnet','rterror','$RAD_SOCKETLIB',mlib]),
+Default(rcontrib)
+env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rcontrib)])
+
+
 rtmain = env.Object(source=['rtmain.c'],
 		CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
-rtsrc = ['rtrace.c', duphead, persist, rtmain]
+rtsrc = ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls]
 rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
-	LIBS=fullib + mlib
+	LIBS=fullib + ['rtnet'] +  mlib
 	)
 Default(rtrace)
 env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
@@ -84,7 +101,11 @@ if env.has_key('X11LIB'): # lots of special requiremen
 	rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
 	rvu = env.Program(target=radbin('rvu'), source=rvsrc,
 		LIBPATH=env['LIBPATH'] + [env['X11LIB']],
-		LIBS=fullib + ['X11'] + mlib)
+		LIBS = (['rtscene', rclib, 'rttrace', 'rtnet', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
+			'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror',
+			'X11'] + mlib)
+		#LIBS=fullib + ['X11', rclib] + mlib
+		)
 	Default(rvu)
 	env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])