--- ray/src/gen/SConscript	2004/10/23 18:55:52	1.5
+++ ray/src/gen/SConscript	2008/04/24 10:28:25	1.9
@@ -24,17 +24,35 @@ PROGS = (
 ('genbranch',   ['genbranch.c',], []),
 ('replmarks',   ['replmarks.c',],
 	['rtproc','rtpath','rtmath','rtio','rterror']),
-('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
-    ['rtproc','rtscene','rtpath','rtmath','rtio','rtcont','rterror']),
+#('mkillum',     Split('mkillum.c mkillum2.c mkillum3.c'),
+#    ['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)
 
+ezxml = env.Object('ezxml.c',
+		CPPDEFINES=env.get('CPPDEFINES',[]) + env.get('EZXML_CPPDEFINES',[]))
+
+prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'),
+		source=Split('mkillum.c mkillum2.c mkillum3.c mkillum4.c') + ezxml,
+		CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
+		LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
+		'rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']
+		+ mlib)
+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',
+		'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib)
+progs.append(prog)
+
 if os.name == 'posix':
 	Default(env.InstallCsh(os.path.join('$RAD_BUILDBIN', 'glaze'), 'glaze.csh'))
 
@@ -42,7 +60,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))