--- ray/src/rt/SConscript	2010/06/02 15:58:30	1.13
+++ ray/src/rt/SConscript	2016/03/05 13:24:58	1.16
@@ -19,27 +19,34 @@ ambio = env.Object(source="ambio.c")
 rayfifo = env.Object(source="rayfifo.c")
 raypwin = env.Object(source="raypwin.c")
 raycalls = env.Object(source="raycalls.c")
+pmaptype = env.Object(source="pmaptype.c")
+pmapparm = env.Object(source="pmapparm.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 pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c '''
+		) + [pmaptype, pmapparm]
 
 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'])
+env.version = Version # make it remotely accessible
 rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
 
 #if os.name == 'nt': # XXX until we get around fork() and friends
@@ -52,17 +59,39 @@ Default(rclib)
 fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
 	'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror']
 # build executables
+mkpmap = env.Program(target=radbin('mkpmap'),
+		source = Split('mkpmap.c') + [Version],
+		LIBS= fullib + ['rtnet', '$RAD_SOCKETLIB', mlib]),
+Default(mkpmap)
+env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', mkpmap)])
+
+pmapdump = env.Program(target=radbin('pmapdump'),
+		source = Split('pmapdump.c') + [pmaptype, pmapparm, Version],
+		LIBS= fullib + ['$RAD_SOCKETLIB', mlib]),
+Default(pmapdump)
+env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', pmapdump)])
+
 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= fullib + ['rtnet', '$RAD_SOCKETLIB', mlib]),
+#		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, 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)])
@@ -88,7 +117,7 @@ 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 = (['rtscene', rclib, 'rttrace', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
+		LIBS = (['rtscene', rclib, 'rttrace', 'rtnet', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
 			'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror',
 			'X11'] + mlib)
 		#LIBS=fullib + ['X11', rclib] + mlib
@@ -99,3 +128,4 @@ if env.has_key('X11LIB'): # lots of special requiremen
 LIBFILES = Split('rayinit.cal')
 env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
 
+# vim: set syntax=python: