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.2 by schorsch, Mon Oct 27 10:35:43 2003 UTC vs.
Revision 1.5 by schorsch, Sun Jul 4 12:08:48 2004 UTC

#	Line 48 | Line 48 | PROGS = (
48		('ra_avs',   ['ra_avs.c'],    ['rtpic','rtio','rtmem']),
49		('ra_ps',    ['ra_ps.c'],     ['rtpic','rtio','rtargs','rtmem']),
50		('ra_ppm',   ['ra_ppm.c'],    ['rtpic','rtio','rtmem']),
51	+	('ra_bmp',   ['ra_bmp.c'],    ['rtpic','rtio','rtmem']),
52		('ra_t8',    ['ra_t8.c', clrtab, neuclrtab], ['rtpic','rtio','rtmem']),
53		('ra_t16',   ['ra_t16.c'],    ['rtpic','rtio','rtmem']),
54		('ra_bn',    ['ra_bn.c'],     ['rtpic','rtio','rtmem']),
#	Line 96 | Line 97 | if os.name == 'posix':
97		cwd = os.getcwd()
98		libtiff = env.Command(radlib(env['LIBPREFIX'] + 'tiff' + env['LIBSUFFIX']),
99		'tiff/config.local',
100	<	['cd "%s";'
101	<	'sh ./configure -quiet -noninteractive -with-CC=$CC -with-ENVOPTS=$CCFLAGS;'
102	<	'cd libtiff;'
103	<	'make install;' % os.path.join(cwd, 'tiff')])
100	>	[('cd "%s"; '
101	>	'sh ./configure -quiet -noninteractive '
102	>	'-with-CC="$CC" -with-ENVOPTS="$CCFLAGS"; '
103	>	'cd libtiff; '
104	>	'make install;') % os.path.join(cwd, 'tiff')])
105
106		# tiff programs
107		ra_tiff = env.Program(target=radbin('ra_tiff'), source=Split('ra_tiff.c'),
#	Line 116 | Line 118 | if os.name == 'posix':
118		# pixar format requires extra lib
119		if env.has_key('PIXAR_LIB'):
120		ra_pixar = env.Program(radbin('ra_pixar'), source=['ra_pixar.c'],
121	<	LIBS=['rtpic', env['PIXAR_LIB']])
121	>	LIBS=['rtpic', env['PIXAR_LIB']])
122		Default(ra_pixar)
123		env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ra_pixar)])
124
#	Line 126 | Line 128 | if env.has_key('X11LIB'):
128		xcppp = env.get('CPPPATH',[]) + [env['X11INCLUDE']]
129		xlibp = env.get('LIBPATH',[]) + [env['X11LIB']]
130		xlibs = ['X11','rtpic','rtio','rtmath','rtargs','rtmem']
131	+	x11findwind = env.Object(source='../common/x11findwind.c') # XXX ../
132
133		ximage = env.Program(target=radbin('ximage'),
134		source=Split('x11image.c x11raster.c')+[clrtab],
#	Line 134 | Line 137 | if env.has_key('X11LIB'):
137		env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], ximage)])
138
139		xshowtrace = env.Program(target=radbin('xshowtrace'),
140	<	source=Split('xshowtrace.c x11findwind.c'),
140	>	source=Split('xshowtrace.c') + [x11findwind],
141		CPPPATH=xcppp, LIBPATH=xlibp, LIBS=xlibs + mlib)
142		Default(xshowtrace)
143		env.Append(RAD_BININSTALL=[env.Install(env['RAD_BINDIR'], xshowtrace)])

Diff Legend

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