--- ray/src/rt/SConscript	2016/03/10 21:43:23	1.17
+++ ray/src/rt/SConscript	2016/03/18 22:58:46	1.18
@@ -43,7 +43,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 +71,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)