--- ray/src/util/SConscript 2008/04/24 10:28:25 1.15 +++ ray/src/util/SConscript 2010/12/15 01:40:11 1.18 @@ -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,9 +62,8 @@ progs.append(getinfo) if env.has_key('X11LIB'): xincl = env.get('CPPPATH', []) + ['$X11INCLUDE'] xlibp = env.get('LIBPATH', []) + ['$X11LIB'] - x11findwind = env.Object(source='#src/common/x11findwind.c', 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) @@ -73,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)