--- ray/src/hd/SConscript	2004/11/08 19:24:46	1.4
+++ ray/src/hd/SConscript	2016/03/28 17:35:13	1.12
@@ -5,37 +5,38 @@ Import('env')
 # math libs
 mlib = env['RAD_MLIB']
 
+# compose paths
+def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
+def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
+
 # common objects
 viewbeams = env.Object(source='viewbeams.c')
 holo = env.Object(source='holo.c')
 holofile = env.Object(source='holofile.c')
-Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
+clumpbeams = env.Object(source='clumpbeams.c')
 
-
 # standard targets
 PROGS = (
 ('rholo', Split('''rholo.c rholo2.c rholo2l.c rholo3.c rholo4.c''')
-	 + [Version, holofile, holo, viewbeams],
-	['rtpic','rtio','rtproc','rtpath','rtargs','rtmath','rtmem','rterror']),
-('rhpict', Split('rhpict.c rhpict2.c')+[Version, holofile, holo, viewbeams],
-	['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
-('rhcopy', Split('rhcopy.c clumpbeams.c') + [holofile, holo],
-	['rtpic','rtio','rtproc','rtargs','rtmath','rtmem','rterror']),
-('rhinfo', Split('rhinfo.c') + [holofile, holo],
-	['rtio','rtproc', 'rtmath','rterror']),
-('genrhgrid', Split('genrhgrid.c') + [holofile, holo],
- ['rtio','rtmath','rtproc','rterror']),
+	 + [env.version, holofile, holo, viewbeams], ['rtrad'],0),
+('rhpict', Split('rhpict.c rhpict2.c')+[env.version, holofile, holo, viewbeams],
+	['rtrad'],1),
+('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo], ['rtrad'],1),
+('rhinfo', Split('rhinfo.c') + [holofile, holo], ['rtrad'],1),
+('rhoptimize', Split('rhoptimize.c') + [clumpbeams,holofile,holo], ['rtrad'],1),
+('genrhgrid', Split('genrhgrid.c') + [holofile, holo], ['rtrad'],1),
 )
-if os.name != 'nt': # pending some major work...
+if 1:
 	for p in PROGS:
-		prog = env.Program(target=os.path.join(env['RAD_BUILDBIN'], p[0]),
+		if not p[3] and os.name == 'nt': continue 
+		prog = env.Program(target=radbin(p[0]),
 				source=p[1], LIBS=p[2] + mlib)
 		Default(prog)
 		env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], prog)])
 
 # display drivers
 if env.has_key('X11INCLUDE'):
-	xenv = env.Copy(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
+	xenv = env.Clone(CPPPATH=[env['X11INCLUDE']] + env['CPPPATH'],
 			LIBPATH=[env['X11LIB']] + env['LIBPATH'],)
 	# common objects
 	rhdisp = xenv.Object(source='rhdisp.c')
@@ -46,32 +47,32 @@ if env.has_key('X11INCLUDE'):
 	devdir = os.path.join(xenv['RAD_BUILDBIN'],'dev')
 	idevdir = os.path.join(xenv['RAD_BINDIR'],'dev')
 	ocppflags = xenv.get('CPPFLAGS', [])
+	addobj = xenv.get('ADDOBJNOTIFY')
 
 	# XXX the .hdi extension will cause problems on Windows
 	xenv['PROGSUFFIX'] = '.hdi'
 
-	dlibs = ['rtpic','rtio','rtmath','rtcont','rtmem','rtargs','rterror']
 	def make_hdi(p): # build them
 		obj = xenv.Object(target=p[3], source=p[4], CPPFLAGS=ocppflags + p[5])
-		prog = xenv.Program(target=os.path.join(devdir, p[0]),
+		prog = xenv.Program(target=radbin(p[0]),
 				source=[obj] + p[1] + xcommon, LIBS=p[2])
 		Default(prog)
 		inst = xenv.Install(idevdir, prog)
 		# XXX what are the alternative "<driver>h" names good for?
-		insth = xenv.InstallAs(target=os.path.join(idevdir,
+		insth = xenv.InstallAs(target=radbin(
 					p[0] + 'h' + xenv['PROGSUFFIX']), source=prog)
 		env.Append(RAD_BININSTALL=[inst, insth])
 
 	# (name, sources,   libs,   obj, objsrc, objflags)
 	XHDI = (('x11',  Split('rhd_ctab.c rhd_qtree2r.c') + [rhd_qtree],
-				dlibs + ['X11'] + mlib,
+				['rtrad', 'X11'] + mlib,
 				'rhd_x11', 'rhd_x11.c', []),
 		   )
 	for p in XHDI:
 		make_hdi(p)
 
 	if env.has_key('OGL'):
-		rgllibs = ['rgl','rtscene','rtpath']
+		rgllibs = ['rgl','rtrad']
 		ogl_common_s = Split('rhd_odraw.c rhd_geom.c')
 		ogl_common = map(lambda s:xenv.Object(source=s), ogl_common_s)
 		rhdobj = xenv.Object(source='rhdobj.c')
@@ -79,17 +80,17 @@ if env.has_key('X11INCLUDE'):
 		GLHDI = (
 			# glx1h
 			('glx1', ['rhd_qtree2c.c', rhd_qtree],
-			 dlibs + ['GLU','GL','X11'] + mlib,
+			 ['rtrad', 'GLU','GL','X11'] + mlib,
 			 'rhd_glx1', 'rhd_glx1.c', ['-DNOSTEREO']),
 
 			# oglh
-			('ogl', ogl_common,
-			 rgllibs+dlibs+['GLU','GL','X11'] + mlib,
+			('ogl', ogl_common + [addobj],
+			 rgllibs+['rtrad', 'GLU','GL','X11'] + mlib,
 			 'rhd_ogl0', 'rhd_ogl.c', ['-DNOSTEREO']),
 
 			# ogloh
-			('oglo', [rhdobj] + ogl_common,
-			 rgllibs+['rtproc']+dlibs+['GLU','GL','X11'] + mlib,
+			('oglo', [rhdobj] + ogl_common + [addobj],
+			 rgllibs+['rtrad']+['rtrad', 'GLU','GL','X11'] + mlib,
 			 'rhd_oglo', 'rhd_ogl.c', ['-DDOBJ', '-DNOSTEREO']),
 			)
 		for p in GLHDI:
@@ -99,16 +100,17 @@ if env.has_key('X11INCLUDE'):
 			GLSHDI = (
 				# oglsh
 				('ogls', ogl_common,
-				 rgllibs+dlibs+['GLU','GL','X11','Xext'] + mlib,
-				 'rhd_ogls', 'rhd_ogl.c' ['-DSTEREO']),
+				 rgllibs+['rtrad', 'GLU','GL','X11','Xext'] + mlib,
+				 'rhd_ogls', 'rhd_ogl.c', ['-DSTEREO']),
 					
 				# oglsoh
 				('oglso', [rhdobj] + ogl_common,
-				 rgllibs+dlibs+['GLU','GL','X11','Xext'] + mlib,
-				 'rhd_oglso', 'rhd_ogl.c' ['-DDOBJ', '-DSTEREO']),
+				 rgllibs+['rtrad', 'GLU','GL','X11','Xext'] + mlib,
+				 'rhd_oglso', 'rhd_ogl.c', ['-DDOBJ', '-DSTEREO']),
 					)
 			for p in GLHDI:
 				make_hdi(p)
 
 
 
+# vim: set syntax=python: