--- ray/src/rt/SConscript	2004/10/21 15:47:13	1.6
+++ ray/src/rt/SConscript	2008/12/23 15:04:01	1.11
@@ -39,13 +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,
@@ -64,7 +66,7 @@ env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', 
 
 rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
 rpict = env.Program(target=radbin('rpict'), source=rpsrc,
-	LIBS=fullib+['rtnet']+mlib)
+	LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib)
 Default(rpict)
 env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
 
@@ -74,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')
@@ -83,7 +85,11 @@ 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=fullib + ['X11'] + mlib)
+		LIBS = (['rtscene', rclib, 'rttrace', 'rtpic', 'rtfunc', 'rtproc', 'rtmath',
+			'rtargs', 'rtpath', 'rtio', 'rtcont', 'rtmem', 'rterror',
+			'X11'] + mlib)
+		#LIBS=fullib + ['X11', rclib] + mlib
+		)
 	Default(rvu)
 	env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])