--- ray/src/rt/SConscript	2004/07/04 12:08:48	1.5
+++ 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
@@ -36,36 +39,39 @@ SUP = Split('func.c noise3.c data.c')
 rsrc = RAY + SURF + MAT + MOD + SUP
 env.Command('Version.c', 'VERSION', vstamp.build_version_c)
 env.Depends('Version.c', rsrc)
-Version = env.Object(source='Version.c')
+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,
 	LIBS=['rtio', 'rtpic'])
 Default(lookamb)
-env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], lookamb)])
+env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', lookamb)])
 
 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 + ['rtproc'] + mlib) # rtproc for win_nice()
+	LIBS=fullib + mlib
+	)
 Default(rtrace)
-env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rtrace)])
+env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rtrace)])
 
 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(env['RAD_BINDIR'], rpict)])
+env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)])
 
 if env.has_key('X11LIB'): # lots of special requirements for rvu
 	x11incls = [env['X11INCLUDE']] + env['CPPPATH']
@@ -73,18 +79,23 @@ 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'] + [env.get('RAD_SPEED', '')])
+	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
 	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(env['RAD_BINDIR'], rvu)])
+	env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rvu)])
 
 LIBFILES = Split('rayinit.cal')
-env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])
+env.Append(RAD_RLIBINSTALL=[env.Install('$RAD_RLIBDIR', LIBFILES)])