--- ray/src/rt/SConscript	2003/10/21 19:27:29	1.1
+++ ray/src/rt/SConscript	2003/10/27 10:35:43	1.2
@@ -2,22 +2,26 @@ import os
 
 Import('env') # inherit from parent
 
-# create a modified local copy of the build environment
-rt = env.Copy(LIBS=env['RAD_MLIB'] + ['rt'])
+mlib = env['RAD_MLIB']
 
 # compose paths
-def radbin(name): return os.path.join(rt['RAD_BUILDBIN'], name)
-def radlib(name): return os.path.join(rt['RAD_BUILDLIB'], name)
+def radbin(name): return os.path.join(env['RAD_BUILDBIN'], name)
+def radlib(name): return os.path.join(env['RAD_BUILDLIB'], name)
 
 # custom compile flags
-dielectric = rt.Object(source='dielectric.c',
-		CCFLAGS=rt['CCFLAGS'] + ['-DDISPERSE'])
+dielectric = env.Object(source='dielectric.c',
+		CCFLAGS=env.get('CCFLAGS',[]) + ['-DDISPERSE'])
 # custom C file generation
-#rt.CFile(target='Version.c', source='VERSION', rt=build_radversion)
+#env.CFile(target='Version.c', source='VERSION', env=build_radversion)
 
+duphead = env.Object(source="duphead.c")
+persist = env.Object(source="persist.c")
+ambio = env.Object(source="ambio.c")
+
+
 # source and object dependencies
-RAY = Split('''ambcomp.c ambient.c ambio.c freeobjmem.c
-		initotypes.c preload.c raytrace.c renderopts.c Version.c''')
+RAY = Split('''ambcomp.c ambient.c freeobjmem.c initotypes.c preload.c
+		raytrace.c renderopts.c Version.c''') + [ambio]
 
 SURF = Split('''sphere.c source.c srcsupp.c virtuals.c o_face.c
 		srcsamp.c o_cone.c o_instance.c o_mesh.c''')
@@ -31,51 +35,54 @@ SUP = Split('func.c noise3.c data.c')
 
 # build libraries
 rsrc = RAY + SURF + MAT + MOD + SUP
-rlib = rt.Library(target=radlib('radiance'), source=rsrc)
+rlib = env.Library(target=radlib('rttrace'), source=rsrc)
 
 if os.name == 'nt': # XXX until we get around fork() and friends
 	rcsrc = Split('raycalls.c')
 else: rcsrc = Split('raycalls.c raypcalls.c')
-rclib = rt.Library(target=radlib('raycalls'), source=rcsrc)
+rclib = env.Library(target=radlib('raycalls'), source=rcsrc)
 Default(rclib)
 
+fullib=['rttrace','rtscene','rtpic','rtfunc','rtproc','rtio','rtmath','rtargs','rtpath','rtcont','rtmem','rterror']
 # build executables
-lasrc = Split('lookamb.c ambio.c')
-lookamb = rt.Program(target=radbin('lookamb'), source=lasrc)
+lasrc = ['lookamb.c', ambio]
+lookamb = env.Program(target=radbin('lookamb'), source=lasrc,
+	LIBS=['rtio', 'rtpic'])
 Default(lookamb)
-env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], lookamb)])
+env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], lookamb)])
 
-if os.name != 'nt': # XXX pending resolution of the free_os() conflict
-	rtmain = rt.Object(source='rtmain.c',
-			CCFLAGS=rt['CCFLAGS'] + ['-DNICE=4'])
-	rtsrc = Split('rtrace.c duphead.c persist.c') + [rtmain, rlib]
-	rtrace = rt.Program(target=radbin('rtrace'), source=rtsrc,)
-	Default(rtrace)
-	env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rtrace)])
+rtmain = env.Object(source=['rtmain.c'],
+		CCFLAGS=env.get('CCFLAGS',[]) + ['-DNICE=4'])
+rtsrc = ['rtrace.c', duphead, persist, rtmain]
+rtrace = env.Program(target=radbin('rtrace'), source=rtsrc,
+	LIBS=fullib + ['rtproc'] + mlib) # rtproc for win_nice()
+Default(rtrace)
+env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rtrace)])
 
-	rpsrc = Split('rpmain.c rpict.c srcdraw.c duphead.c persist.c') + [rlib]
-	rpict = rt.Program(target=radbin('rpict'), source=rpsrc,)
-	Default(rpict)
-	env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rpict)])
+rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist]
+rpict = env.Program(target=radbin('rpict'), source=rpsrc,
+	LIBS=fullib+['rtnet']+mlib)
+Default(rpict)
+env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rpict)])
 
-if rt.has_key('X11LIB'): # lots of special requirements for rview
-	x11incls = [rt['X11INCLUDE']] + rt['CPPPATH']
-	x11 = rt.Object(source='x11.c', CPPPATH=x11incls)
-	x11twind = rt.Object(source='x11twind.c', CPPPATH=x11incls)
-	rvmain = rt.Object(source='rvmain.c',
-		CCFLAGS=rt['CCFLAGS'] + ['-DNICE=6'])
-	rv3 = rt.Object(source='rv3.c', # XXX we should get rid of SPEED
-		CCFLAGS=rt['CCFLAGS'] + [rt.get('RAD_SPEED', '')])
+if env.has_key('X11LIB'): # lots of special requirements for rview
+	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', # XXX we should get rid of SPEED
+		CCFLAGS=env['CCFLAGS'] + [env.get('RAD_SPEED', '')])
 
 	devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
 	rvobjs = [x11, x11twind, rv3, rvmain, rlib]
 	rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
-	rview = rt.Program(target=radbin('rview'), source=rvsrc,
-		LIBPATH=rt['LIBPATH'] + [rt['X11LIB']],
-		LIBS=rt['LIBS'] + ['X11'])
+	rview = env.Program(target=radbin('rview'), source=rvsrc,
+		LIBPATH=env['LIBPATH'] + [env['X11LIB']],
+		LIBS=fullib + ['X11'] + mlib)
 	Default(rview)
-	env.Append(RAD_BININSTALL=[rt.Install(rt['RAD_BINDIR'], rview)])
+	env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], rview)])
 
 LIBFILES = Split('rayinit.cal')
-env.Append(RAD_RLIBINSTALL=[rt.Install(rt['RAD_RLIBDIR'], LIBFILES)])
+env.Append(RAD_RLIBINSTALL=[env.Install(env['RAD_RLIBDIR'], LIBFILES)])