--- ray/src/gen/SConscript	2016/03/05 00:29:28	1.15
+++ ray/src/gen/SConscript	2018/01/08 13:38:37	1.19
@@ -1,3 +1,5 @@
+from __future__ import division, print_function, unicode_literals
+
 import os
 
 Import('env') # inherit from parent
@@ -11,29 +13,22 @@ sun = env.Object(source="sun.c")
 # standard targets
 PROGS = (
 # name          sources           libs
-('gendaylit',   Split('gendaylit.c',)+[sun], ['rtlamps']),
+('gendaylit',   Split('gendaylit.c',)+[sun], ['rtrad']),
+('gendaymtx',   Split('gendaymtx.c',)+[sun], ['rtrad',mlib]),
 ('genbeads',    Split('genbeads.c hermite3.c'),  []),
 ('genbox',      ['genbox.c',],    []),
 ('genmarble',   ['genmarble.c',], []),
 ('gensky',      Split('gensky.c',)+[sun], []),
 ('genblinds',   ['genblinds.c',], []),
 ('genprism',    ['genprism.c',],  []),
-('genrev',      ['genrev.c',],    ['rtfunc','rtcont','rtmem','rtio','rterror']),
+('genrev',      ['genrev.c',],    ['rtrad',]),
 ('gencatenary', ['gencat.c',],    []),
-('genworm',     ['genworm.c',],
-	['rtfunc','rtmem','rtcont','rtmath','rtio','rterror']),
-('gensurf',     ['gensurf.c',],
-	['rtfunc','rtmem','rtcont','rtmath','rtio','rterror']),
+('genworm',     ['genworm.c',],   ['rtrad']),
+('gensurf',     ['gensurf.c',],   ['rtrad']),
 ('genclock',    ['genclock.c',],  []),
 ('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']),
-#('mksource',    ['mksource.c'],
-#	['rtio','rtmath','rterror']),
-('xform',       ['xform.c',],
-    ['rtproc','rtscene','rtmath','rtargs','rtio','rtcont','rtpath','rterror']),
+('replmarks',   ['replmarks.c',], ['rtrad']),
+('xform',       ['xform.c',],     ['rtrad']),
 )
 progs = []
 for p in PROGS:
@@ -44,25 +39,30 @@ for p in PROGS:
 prog = env.Program(target=os.path.join('$RAD_BUILDBIN', 'mkillum'),
 		source=Split('mkillum.c mkillum2.c mkillum3.c'),
 		CPPPATH=env.get('CPPPATH', []) + ['#src/rt'],
-		LIBS=['raycalls','rttrace','rtscene','rtpic','rtfunc','rtproc',
-		'rtnet','rtpath','rtmath','rtargs','rtio','rtcont','rtmem','rterror']
-		+ mlib)
+		LIBS=['raycalls','rttrace','rtrad'] + 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','rtproc','rtnet',
-		'rtmath','rtcont','rtmem','rtargs','rtio','rtpath','rterror'] + mlib)
+		LIBS=['raycalls','rttrace','rtrad'] + mlib)
 progs.append(prog)
 
 if os.name == 'posix':
-	Default(env.InstallScript(os.path.join('$RAD_BUILDBIN', 'glaze'), 'glaze.csh'))
+	Default(env.InstallScript(os.path.join('$RAD_BUILDBIN', 'glaze.csh'),
+				'glaze.csh'))
+	Default(env.InstallScript(os.path.join('$RAD_BUILDBIN', 'glaze'),
+				'glaze.py'))
+else:
+	Default(env.InstallScript(os.path.join('$RAD_BUILDBIN', 'glaze.py'),
+				'glaze.py'))
 
 Default('#src/gen')
 env.Install('$RAD_BINDIR', progs)
 
 #surf.cal clockface.hex
-LIBFILES = Split('illum.cal rev.cal skybright.cal glaze1.cal glaze2.cal perezlum.cal coeff_perez.dat defangle.dat')
+LIBFILES = Split('''illum.cal rev.cal skybright.cal glaze1.cal glaze2.cal
+		perezlum.cal''')
 env.Append(RAD_RLIBINSTALL=env.Install('$RAD_RLIBDIR', LIBFILES))
 
-
+# vim: set syntax=python:
+# vi: set ts=4 sw=4 :