--- ray/src/util/SConscript	2008/04/21 07:31:30	1.14
+++ ray/src/util/SConscript	2010/12/15 01:40:11	1.18
@@ -9,7 +9,7 @@ progs = []
 def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
 def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
 
-Version = env.Object(source='../rt/Version.c') # XXX ../rt/not_nice
+Version = env.Object(source='#src/rt/Version.c')
 
 # standard targets
 PROGS = [
@@ -27,7 +27,9 @@ PROGS = [
 	'rtnet','rterror','$RAD_SOCKETLIB']),
 ('rtcontrib', ['rtcontrib.c', Version],
 	['rtpic','rtargs','rtfunc','rtio','rtproc','rtcont','rtmem','rtpath',
-	'rtmath','rtnet','rterror','$RAD_SOCKETLIB'])
+	'rtmath','rtnet','rterror','$RAD_SOCKETLIB']),
+('dctimestep', ['dctimestep.c'],
+	['rtall'])
 ]
 
 for p in PROGS:
@@ -60,10 +62,8 @@ progs.append(getinfo)
 if env.has_key('X11LIB'):
 	xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
 	xlibp = env.get('LIBPATH', []) + ['$X11LIB']
-	x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
-			CPPPATH=xincl)
 	xglaresrc = env.Program(target=radbin('xglaresrc'),
-			source=Split('xglaresrc.c') + [x11findwind],
+			source=Split('xglaresrc.c') + [env.x11findwind], # XXX remote magic
 			LIBPATH=xlibp, CPPPATH=xincl,
 			LIBS=['rtpic','rtmath','rtargs','rtio','X11']+ mlib)
 	progs.append(xglaresrc)
@@ -74,7 +74,7 @@ if env.has_key('X11LIB'):
 			CPPFLAGS=env.get('CPPFLAGS', []) + ['$RAD_STEREO'],
 			LIBPATH=xlibp, CPPPATH=xincl,
 			LIBS=['rgl','rtpic','rtscene','rtproc','rtpath','rtargs','rtio',
-			'rtmath','rtcont','rtmem','rterror',
+			'rtmath','rtcont','rtmem','rterror','rtdummy',
 			'GL', 'GLU','X11'],)
 		progs.append(glrad)