--- ray/src/gen/SConscript	2004/10/21 15:47:12	1.4
+++ ray/src/gen/SConscript	2005/09/19 12:32:12	1.7
@@ -14,25 +14,36 @@ PROGS = (
 ('gensky',      Split('gensky.c sun.c',), []),
 ('genblinds',   ['genblinds.c',], []),
 ('genprism',    ['genprism.c',],  []),
-('genrev',      ['genrev.c',],    ['rterror','rtfunc','rtcont','rtmem']),
+('genrev',      ['genrev.c',],    ['rtfunc','rtcont','rtmem','rtio','rterror']),
 ('gencatenary', ['gencat.c',],    []),
-('genworm',     ['genworm.c',],   ['rtfunc','rtmem','rtcont','rtmath']),
-('gensurf',     ['gensurf.c',],   ['rtfunc','rtmem','rtcont','rtmath','rtio']),
+('genworm',     ['genworm.c',],
+	['rtfunc','rtmem','rtcont','rtmath','rtio','rterror']),
+('gensurf',     ['gensurf.c',],
+	['rtfunc','rtmem','rtcont','rtmath','rtio','rterror']),
 ('genclock',    ['genclock.c',],  []),
 ('genbranch',   ['genbranch.c',], []),
 ('replmarks',   ['replmarks.c',],
 	['rtproc','rtpath','rtmath','rtio','rterror']),
 ('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
-    ['rtscene','rtproc','rtpath','rtmath','rtio','rtcont','rterror']),
+    ['rtproc','rtscene','rtpath','rtmath','rtio','rtcont','rterror']),
+#('mksource',    ['mksource.c'],
+#	['rtio','rtmath','rterror']),
 ('xform',       ['xform.c',],
     ['rtproc','rtscene','rtmath','rtargs','rtio','rtcont','rtpath','rterror']),
 )
 progs = []
 for p in PROGS:
-    prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
+    prog = env.Program(target=os.path.join('$RAD_BUILDBIN', p[0]),
             source=p[1], LIBS=p[2] + mlib)
     progs.append(prog)
 
+prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mksource'),
+		source=['mksource.c'],
+		CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
+		LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtio',
+		'rtmath','rtcont','rtmem','rtargs','rtpath','rterror'] + mlib)
+progs.append(prog)
+
 if os.name == 'posix':
 	Default(env.InstallCsh(os.path.join('$RAD_BUILDBIN', 'glaze'), 'glaze.csh'))
 
@@ -40,7 +51,7 @@ Default('#src/gen')
 env.Install('$RAD_BINDIR', progs)
 
 #surf.cal clockface.hex
-LIBFILES = Split('illum.cal rev.cal skybright.cal glaze1.cal glaze2.cal')
+LIBFILES = Split('illum.cal rev.cal skybright.cal surf.cal glaze1.cal glaze2.cal clockface.hex')
 env.Append(RAD_RLIBINSTALL=env.Install('$RAD_RLIBDIR', LIBFILES))