--- ray/src/common/SConscript	2004/07/03 22:34:56	1.4
+++ ray/src/common/SConscript	2006/03/10 19:40:12	1.8
@@ -35,7 +35,7 @@ RTLAMPS = Split('''fropen.c rexpr.c lamps.c''')
 
 RTPROC = Split('''process.c''') + env.get('RAD_PROCESS', [])
 
-RTMEM = Split('ealloc.c') + env.get('RAD_MEMCOMPAT', [])
+RTMEM = Split('ealloc.c bmalloc.c')
 RTNET = Split('myhostname.c')
 
 STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
@@ -60,14 +60,16 @@ rtlamps = env.StaticLibrary(target=radlib('rtlamps'), 
 rtpic = env.StaticLibrary(target=radlib('rtpic'), source=RTPIC)
 rtnet = env.StaticLibrary(target=radlib('rtnet'), source=RTNET)
 
-#librt = env.StaticLibrary(target=radlib('rt'), source=ALL)
-#Default(librt)
+#librtrad = env.StaticLibrary(target=radlib('rtrad'), source=ALL)
+#Default(librtrad)
 
 LIBFILES = Split('tmesh.cal')
 env.Append(RAD_RLIBINSTALL=env.Install(env['RAD_RLIBDIR'], LIBFILES))
 
 if env.has_key('OGL'):
-    RGL = Split('rglfile.c rglmat.c rgldomat.c rglsurf.c rglinst.c rglsrc.c')
-    librgl = env.StaticLibrary(target=radlib('rgl'), source=RGL)
-    Default(librgl)
+	oglincl = env.get('CPPPATH', []) + env.get('OGLINCLUDE', [])
+	RGL = Split('rglfile.c rglmat.c rgldomat.c rglsurf.c rglinst.c rglsrc.c')
+	librgl = env.StaticLibrary(target=radlib('rgl'), source=RGL,
+			CPPPATH=oglincl)
+	Default(librgl)