--- ray/src/common/SConscript	2004/07/03 22:34:56	1.4
+++ ray/src/common/SConscript	2005/02/02 00:16:02	1.6
@@ -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') + env.get('RAD_MEMCOMPAT', [])
 RTNET = Split('myhostname.c')
 
 STD = (RTERROR + RTPATH +  RTARGS + RTIO + RTMATH + RTCONT + RTMEM +
@@ -67,7 +67,9 @@ 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)