--- ray/src/rt/SConscript	2004/10/21 15:47:13	1.6
+++ ray/src/rt/SConscript	2016/03/18 22:58:46	1.18
@@ -16,77 +16,87 @@ 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")
+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'])
-rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
+env.version = Version # make it remotely accessible
+tracelib = 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')
-rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
+rclib = env.Library(target=radlib('raycalls'),
+		source=Split('raycalls.c $RAD_PCALLS'))
 Default(rclib)
 
-fullib=['rttrace','rtscene','rtpic','rtfunc','rtproc','rtio','rtmath','rtargs','rtpath','rtcont','rtmem','rterror']
-# build executables
-lasrc = ['lookamb.c', ambio]
-lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
-	LIBS=['rtio', 'rtpic'])
-Default(lookamb)
-env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
-
 rtmain = env.Object(source=['rtmain.c'],
 		CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
-rtsrc = ['rtrace.c', duphead, persist, rtmain]
-rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
-	LIBS=fullib + mlib
-	)
-Default(rtrace)
-env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
 
-rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
-rpict = env.Program(target=radbin('rpict'), source=rpsrc,
-	LIBS=fullib+['rtnet']+mlib)
-Default(rpict)
-env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
+# build executables
+PROGS = [
+('mkpmap',   ['mkpmap.c', Version],
+	 ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
+('pmapdump', ['pmapdump.c', pmaptype, pmapparm, Version],
+	 ['rtrad', '$RAD_SOCKETLIB', mlib]),
+('lookamb',  ['lookamb.c', ambio], ['rtrad', mlib]),
+('rcontrib', Split('rcmain.c rcontrib.c rc2.c rc3.c') + [Version],
+	 ['rttrace', 'rtrad', '$RAD_SOCKETLIB', mlib]),
+('rtrace',   ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls],
+	 ['rttrace', 'rtrad'] +  mlib),
+('rpict',    Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist],
+	 ['rttrace', 'rtrad', '$RAD_SOCKETLIB']+mlib),
+]
+for p in PROGS:
+	prog = env.Program(target=radbin(p[0]), source = p[1], LIBS = p[2]),
+	Default(prog)
+	env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', prog)])
 
+# we need RVOBJS for any derived viewers, such as winrview
+if os.name == 'nt': RV_DEF = ['WIN_RVIEW']
+else: RV_DEF = []
+rvmain = env.Object(source='rvmain.c',
+		CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
+rvobjs = [rvmain]
+for src in  Split('''rview.c rv2.c rv3.c
+	devtable.c devcomm.c colortab.c editline.c'''):
+	rvobjs.append(env.Object(source=src,
+			CPPDEFINES=env.get('CPPDEFINES', []) + RV_DEF))
+env['RVOBJS'] = rvobjs
+
 if env.has_key('X11LIB'): # lots of special requirements for rvu
 	x11incls = [env['X11INCLUDE']] + env['CPPPATH']
 	x11 = env.Object(source='x11.c', CPPPATH=x11incls)
 	x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
-	rvmain = env.Object(source='rvmain.c',
-		CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
-	rv3 = env.Object(source='rv3.c', # XXX we should get rid of SPEED
-		CCFLAGS=env['CCFLAGS'] + ['$RAD_SPEED']
-		)
-
-	devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
-	rvobjs = [x11, x11twind, rv3, rvmain, rlib]
-	rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
+	rvxobjs = [x11, x11twind]
+	rvsrc =  rvobjs + rvxobjs
 	rvu = env.Program(target=radbin('rvu'), source=rvsrc,
 		LIBPATH=env['LIBPATH'] + [env['X11LIB']],
-		LIBS=fullib + ['X11'] + mlib)
+		LIBS = ([rclib, 'rttrace', 'rtrad', 'X11'] + mlib)
+		)
 	Default(rvu)
 	env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
 
 LIBFILES = Split('rayinit.cal')
 env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
 
+# vim: set syntax=python: