--- ray/src/rt/SConscript	2016/03/10 21:43:23	1.17
+++ ray/src/rt/SConscript	2018/01/08 13:38:37	1.19
@@ -1,3 +1,5 @@
+from __future__ import division, print_function, unicode_literals
+
 import os
 from build_utils import vstamp
 
@@ -27,8 +29,11 @@ pmapparm = env.Object(source="pmapparm.c")
 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]
+        pmapbias.c pmapcontrib.c pmapamb.c pmapray.c pmapopt.c pmapdiag.c
+		oocbuild.c ooccache.c oocnn.c oocmorton.c oococt.c oocsort.c
+		pmcontrib2.c pmapkdt.c pmutil.c
+		''') + [pmaptype, pmapparm]
+# not ready yet: pmapooc.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
@@ -43,7 +48,7 @@ env.Command('Version.c', 'VERSION', vstamp.build_versi
 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])
+tracelib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
 
 rclib = env.Library(target=radlib('raycalls'),
 		source=Split('raycalls.c $RAD_PCALLS'))
@@ -71,20 +76,24 @@ for p in PROGS:
 	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',
-		CCFLAGS=env['CCFLAGS']
-		)
-
-	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 = ([rclib, 'rttrace', 'rtrad', 'X11'] + mlib)
@@ -96,3 +105,4 @@ LIBFILES = Split('rayinit.cal')
 env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])
 
 # vim: set syntax=python:
+# vi: set ts=4 sw=4 :