ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/SConscript

Comparing ray/src/px/SConscript (file contents):
Revision 1.20 by schorsch, Sat Mar 5 00:29:28 2016 UTC vs.
Revision 1.22 by schorsch, Thu Mar 10 17:36:18 2016 UTC

#	Line 7 | Line 7 | progs = []
7
8		# compose paths
9		def radbin(name): return os.path.join('$RAD_BUILDBIN', name)
10	–	#def radbin(name): return name
10		def radlib(name): return os.path.join('$RAD_BUILDLIB', name)
11
12		warp3d = env.Object(source="warp3d.c")
#	Line 48 | Line 47 | PROGS = (
47		('ra_pict',  ['ra_pict.c'],   ['rtpic','rtio','rtmem']),
48		('ra_hexbit',['ra_hexbit.c'], ['rtpic','rtio','rtmem']),
49		('ra_xyze',  ['ra_xyze.c'],   ['rtpic','rtio','rtmem']),
50	+	('pmblur2',  ['pmblur2.c'],   ['rtpic','rtargs','rtio','rtargs','rtmath','rtmem','rtcont','rterror',mlib]),
51
52		('ttyimage', ['ttyimage.c'],  ['rtpic','rtio','rtmem']),
53		)
#	Line 86 | Line 86 | if os.name == 'posix': # cleanup action for a previous
86		Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')])
87
88		if env.get('TIFFLIB_INSTALLED'):
89	+	libtiff = env.get('RAD_LIBTIFF')
90		# tiff programs
91		tiffi = env.get('RAD_TIFFINCLUDE')
92		if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', [])
#	Line 96 | Line 97 | if env.get('TIFFLIB_INSTALLED'):
97
98		ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
99		CPPPATH = tiffincl, LIBPATH=tifflib,
100	<	LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
100	>	LIBS=[libtiff,'rtpic','rtio','rtmem'] + mlib)
101		progs.append(ra_tiff)
102
103		normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
104		CPPPATH = tiffincl, LIBPATH=tifflib,
105	<	LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
105	>	LIBS=[libtiff,'rtpic','rtio','rtmem', 'rtproc', 'rtpath', 'rterror'] + mlib)
106		progs.append(normtiff)
107
108
#	Line 124 | Line 125 | if env.has_key('X11LIB'):
125		progs.append(xshowtrace)
126
127		if os.name == 'posix': # XXX ignoring trad.wsh
128	<	for s in Split('''normpat pdfblur pmblur pmdblur pbilat
129	<	xyzimage phisto pdelta pgblur ra_pfm ran2tiff'''):
128	>	for s in Split('''normpat pdfblur pmblur pmdblur
129	>	xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat'''):
130		Default(env.InstallScript(radbin(s), s + '.csh'))
131		for s in Split('''falsecolor'''):
132		Default(env.InstallScript(radbin(s), s + '.pl'))
#	Line 138 | Line 139 | if os.name == 'posix': # XXX ignoring trad.wsh
139		Default('#src/px')
140		env.Install('$RAD_BINDIR', progs)
141
142	+	# vim: set syntax=python:

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)