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.18 by schorsch, Sun Apr 27 17:22:49 2008 UTC vs.
Revision 1.19 by schorsch, Tue Dec 23 15:04:00 2008 UTC

#	Line 57 | Line 57 | for p in PROGS:
57		progs.append(prog)
58
59
60	<	# tiff library (unix-specific for the moment)
61	<	if os.name == 'posix':
60	>	# tiff library (building it is unix-specific for the moment)
61	>	#  If we haven't found one supporting LogLuv installed, build our own.
62	>	libtiff_fn = radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX'])
63	>	if os.name == 'posix' and not env.get('TIFFLIB_INSTALLED'):
64		cwd = os.getcwd()
65		upperdir = os.path.split(cwd)[0]
66	<
65	<	libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
66	<	None,
66	>	libtiff = env.Command(libtiff_fn, None,
67		[('cd "%(tiffdir)s"; '
68		'env CC="$CC" '
69		'./configure -C '
#	Line 80 | Line 80 | if os.name == 'posix':
80		}
81		])
82
83	+	env['TIFFLIB_INSTALLED'] = 1
84	+
85	+	if os.name == 'posix': # cleanup action for a previously built tifflib
86	+	Clean(libtiff_fn, [libtiff_fn, radlib(env['LIBPREFIX'] + 'tiff.la')])
87	+
88	+	if env.get('TIFFLIB_INSTALLED'):
89		# tiff programs
90	+	tiffi = env.get('RAD_TIFFINCLUDE')
91	+	if tiffi: tiffincl = [tiffi] + env.get('CPPPATH', [])
92	+	else: tiffincl = env.get('CPPPATH', [])
93	+	tiffl = env.get('RAD_TIFFLIB')
94	+	if tiffl: tifflib = [tiffl] + env.get('LIBPATH', [])
95	+	else: tifflib = env.get('LIBPATH', [])
96	+
97		ra_tiff = env.Program(target=radbin('ra_tiff'), source=['ra_tiff.c'],
98	+	CPPPATH = tiffincl, LIBPATH=tifflib,
99		LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
100		progs.append(ra_tiff)
101
102		normtiff = env.Program(target=radbin('normtiff'),source=['normtiff.c'],
103	+	CPPPATH = tiffincl, LIBPATH=tifflib,
104		LIBS=['tiff','rtpic','rtio','rtmem'] + mlib)
105		progs.append(normtiff)
106
107
108		# X11 targets
109		if env.has_key('X11LIB'):
110	<	xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
111	<	xlibp = env.get('LIBPATH', []) + ['$X11LIB']
112	<	xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
113	<	x11findwind = env.Object(source='../common/x11findwind.c', # XXX ../not/nice
114	<	CPPPATH=xincl)
110	>	xincl = env.get('CPPPATH', []) + ['$X11INCLUDE']
111	>	xlibp = env.get('LIBPATH', []) + ['$X11LIB']
112	>	xlibs = ['X11','rtpic','rtargs','rtio','rtmath','rtmem']
113	>	env.x11findwind = env.Object(source='../common/x11findwind.c', # XXX remote magic
114	>	CPPPATH=xincl)
115
116	<	ximage = env.Program(target=radbin('ximage'),
117	<	source=Split('x11image.c x11raster.c')+[clrtab],
118	<	CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
119	<	progs.append(ximage)
116	>	ximage = env.Program(target=radbin('ximage'),
117	>	source=Split('x11image.c x11raster.c')+[clrtab],
118	>	CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
119	>	progs.append(ximage)
120
121	<	xshowtrace = env.Program(target=radbin('xshowtrace'),
122	<	source=Split('xshowtrace.c') + [x11findwind],
123	<	CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
124	<	progs.append(xshowtrace)
121	>	xshowtrace = env.Program(target=radbin('xshowtrace'),
122	>	source=Split('xshowtrace.c') + [env.x11findwind], # XXX remote magic
123	>	CPPPATH=xincl, LIBPATH=xlibp, LIBS=xlibs + mlib)
124	>	progs.append(xshowtrace)
125
126		if os.name == 'posix': # XXX ignoring trad.wsh
127		for s in Split('''normpat falsecolor pdfblur pmblur pmdblur pbilat

Diff Legend

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