--- ray/src/px/SConscript 2016/03/05 00:29:28 1.20 +++ ray/src/px/SConscript 2016/03/10 17:36:18 1.22 @@ -7,7 +7,6 @@ progs = [] # compose paths def radbin(name): return os.path.join('$RAD_BUILDBIN', name) -#def radbin(name): return name def radlib(name): return os.path.join('$RAD_BUILDLIB', name) warp3d = env.Object(source="warp3d.c") @@ -48,6 +47,7 @@ PROGS = ( ('ra_pict', ['ra_pict.c'], ['rtpic','rtio','rtmem']), ('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']), ('ra_xyze', ['ra_xyze.c'], ['rtpic','rtio','rtmem']), +('pmblur2', ['pmblur2.c'], ['rtpic','rtargs','rtio','rtargs','rtmath','rtmem','rtcont','rterror',mlib]), ('ttyimage', ['ttyimage.c'], ['rtpic','rtio','rtmem']), ) @@ -86,6 +86,7 @@ if os.name == 'posix': # cleanup action for a previous Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')]) if env.get('TIFFLIB_INSTALLED'): + libtiff = env.get('RAD_LIBTIFF') # tiff programs tiffi = env.get('RAD_TIFFINCLUDE') if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', []) @@ -96,12 +97,12 @@ if env.get('TIFFLIB_INSTALLED'): ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'], CPPPATH = tiffincl, LIBPATH=tifflib, - LIBS=['tiff','rtpic','rtio','rtmem'] + mlib) + LIBS=[libtiff,'rtpic','rtio','rtmem'] + mlib) progs.append(ra_tiff) normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'], CPPPATH = tiffincl, LIBPATH=tifflib, - LIBS=['tiff','rtpic','rtio','rtmem'] + mlib) + LIBS=[libtiff,'rtpic','rtio','rtmem', 'rtproc', 'rtpath', 'rterror'] + mlib) progs.append(normtiff) @@ -124,8 +125,8 @@ if env.has_key('X11LIB'): progs.append(xshowtrace) if os.name == 'posix': # XXX ignoring trad.wsh - for s in Split('''normpat pdfblur pmblur pmdblur pbilat - xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''): + for s in Split('''normpat pdfblur pmblur pmdblur + xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat'''): Default(env.InstallScript(radbin(s), s + '.csh')) for s in Split('''falsecolor'''): Default(env.InstallScript(radbin(s), s + '.pl')) @@ -138,3 +139,4 @@ if os.name == 'posix': # XXX ignoring trad.wsh Default('#src/px') env.Install('$RAD_BINDIR', progs) +# vim: set syntax=python: