--- ray/src/hd/SConscript	2003/10/27 10:35:42	1.2
+++ ray/src/hd/SConscript	2008/04/21 07:31:29	1.6
@@ -9,22 +9,23 @@ mlib = env['RAD_MLIB']
 viewbeams = env.Object(source='viewbeams.c')
 holo = env.Object(source='holo.c')
 holofile = env.Object(source='holofile.c')
-Version = env.Object(source='Version.c')
+clumpbeams = env.Object(source='clumpbeams.c')
+Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
 
 
 # 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']),
+	['rtpic','rtproc','rtpath','rtio','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']),
+	['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
+('rhcopy', Split('rhcopy.c') + [clumpbeams, holofile, holo],
+	['rtpic','rtproc','rtargs','rtio','rtmath','rtmem','rterror']),
 ('rhinfo', Split('rhinfo.c') + [holofile, holo],
 	['rtio','rtproc', 'rtmath','rterror']),
-#('genrhenv', Split('genrhenv.c') + [holofile, holo],
-# []), # XXX broken
+('rhoptimize', Split('rhoptimize.c') + [clumpbeams, holofile, holo],
+	['rtio','rtproc', 'rtmath','rterror']),
 ('genrhgrid', Split('genrhgrid.c') + [holofile, holo],
  ['rtio','rtmath','rtproc','rterror']),
 )
@@ -52,7 +53,7 @@ if env.has_key('X11INCLUDE'):
 	# XXX the .hdi extension will cause problems on Windows
 	xenv['PROGSUFFIX'] = '.hdi'
 
-	dlibs = ['rtpic','rtio','rtmath','rtcont','rtmem','rtargs','rterror']
+	dlibs = ['rtpic','rtmath','rtcont','rtmem','rtargs','rtio','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]),
@@ -74,31 +75,22 @@ if env.has_key('X11INCLUDE'):
 
 	if env.has_key('OGL'):
 		rgllibs = ['rgl','rtscene','rtpath']
-		# XXX There's a BITS(x) macro missing in sm_geom.h
-		#sm_common_s = Split('''sm_samp.c sm_qtree.c sm_stree.c sm_geom.c
-		#		sm_list.c sm_del.c sm_ogl.c sm_usets.c sm.c''')
-		#sm_common = map(lambda s:xenv.Object(source=s), sm_common_s)
 		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')
 
 		GLHDI = (
+			# glx1h
 			('glx1', ['rhd_qtree2c.c', rhd_qtree],
 			 dlibs + ['GLU','GL','X11'] + mlib,
 			 'rhd_glx1', 'rhd_glx1.c', ['-DNOSTEREO']),
 
-			#('glx',  sm_common,
-			# dlibs + ['GLU','GL','X11'] + mlib,
-			# 'rhd_glx0', 'rhd_glx.c', ['-DNOSTEREO']),
-
-			#('glxo', [rhdobj] + sm_common,
-			# rgllibs+dlibs+['GLU','GL','X11'] + mlib,
-			# 'rhd_glxo', 'rhd_glx.c', ['-DDOBJ', '-DNOSTEREO']),
-
+			# oglh
 			('ogl', ogl_common,
 			 rgllibs+dlibs+['GLU','GL','X11'] + mlib,
 			 'rhd_ogl0', 'rhd_ogl.c', ['-DNOSTEREO']),
 
+			# ogloh
 			('oglo', [rhdobj] + ogl_common,
 			 rgllibs+['rtproc']+dlibs+['GLU','GL','X11'] + mlib,
 			 'rhd_oglo', 'rhd_ogl.c', ['-DDOBJ', '-DNOSTEREO']),
@@ -108,18 +100,12 @@ if env.has_key('X11INCLUDE'):
 		if xenv['RAD_STEREO'] == '-DSTEREO':
 
 			GLSHDI = (
-				#('glxs',  sm_common,
-				# dlibs + ['GLU','GL','X11','Xext'] + mlib,
-				# 'rhd_glxs', 'rhd_glx.c' ['-DSTEREO']),
-
-				#('glxso', [rhdobj] + sm_common,
-				# rgllibs+dlibs+['GLU','GL','X11','Xext'] + mlib,
-				# 'rhd_glxo', 'rhd_glx.c' ['-DDOBJ', '-DSTEREO']),
-
+				# oglsh
 				('ogls', ogl_common,
 				 rgllibs+dlibs+['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']),