--- ray/src/rt/SConscript	2005/09/19 11:30:10	1.9
+++ ray/src/rt/SConscript	2010/05/27 19:32:13	1.12
@@ -16,6 +16,9 @@ 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')
 
 
 # source and object dependencies
@@ -39,14 +42,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,
@@ -56,7 +60,7 @@ env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', 
 
 rtmain = env.Object(source=['rtmain.c'],
 		CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
-rtsrc = ['rtrace.c', duphead, persist, rtmain]
+rtsrc = ['rtrace.c', duphead, persist, rtmain, rayfifo, raypwin, raycalls]
 rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
 	LIBS=fullib + mlib
 	)
@@ -84,7 +88,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)])