--- ray/src/rt/SConscript	2005/09/14 09:28:35	1.8
+++ ray/src/rt/SConscript	2008/04/21 07:31:30	1.10
@@ -39,14 +39,15 @@ 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,
@@ -75,8 +76,8 @@ if env.has_key('X11LIB'): # lots of special requiremen
 	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']
+	rv3 = env.Object(source='rv3.c',
+		CCFLAGS=env['CCFLAGS']
 		)
 
 	devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')