--- ray/src/rt/SConscript 2004/10/21 15:47:13 1.6 +++ ray/src/rt/SConscript 2005/09/19 11:30:10 1.9 @@ -45,7 +45,8 @@ else: rcsrc = Split('raycalls.c raypcalls.c') rclib = env.Library(target=radlib('raycalls'), source=rcsrc) Default(rclib) -fullib=['rttrace','rtscene','rtpic','rtfunc','rtproc','rtio','rtmath','rtargs','rtpath','rtcont','rtmem','rterror'] +fullib=['rttrace', 'rtscene', 'rtpic', 'rtfunc', 'rtproc', 'rtio', 'rtmath', + 'rtargs', 'rtpath', 'rtcont', 'rtmem', 'rterror'] # build executables lasrc = ['lookamb.c', ambio] lookamb = env.Program(target=radbin('lookamb'), source=lasrc, @@ -64,7 +65,7 @@ env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpsrc = Split('rpmain.c rpict.c srcdraw.c') + [duphead, persist] rpict = env.Program(target=radbin('rpict'), source=rpsrc, - LIBS=fullib+['rtnet']+mlib) + LIBS=fullib+['rtnet','$RAD_SOCKETLIB']+mlib) Default(rpict) env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', rpict)]) @@ -74,8 +75,8 @@ if env.has_key('X11LIB'): # lots of special requiremen x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls) rvmain = env.Object(source='rvmain.c', CCFLAGS=env['CCFLAGS'] + ['-DNICE=6']) - rv3 = env.Object(source='rv3.c', # XXX we should get rid of SPEED - CCFLAGS=env['CCFLAGS'] + ['$RAD_SPEED'] + rv3 = env.Object(source='rv3.c', + CCFLAGS=env['CCFLAGS'] ) devsrc = Split('devtable.c devcomm.c colortab.c editline.c')