sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

append rather than prepend cairo paths to ensure that internal/local paths come first as per the last configure sort by priority

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-10 17:08:58 -08:00
parent c649fa63dc
commit 805664056a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/build.py
View file

@ -198,11 +198,11 @@ source = Split(
) )
if env['HAS_CAIRO']: if env['HAS_CAIRO']:
lib_env.PrependUnique(LIBPATH=env['CAIRO_LIBPATHS']) lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS'])
lib_env.Append(LIBS=env['CAIRO_LINKFLAGS']) lib_env.Append(LIBS=env['CAIRO_LINKFLAGS'])
lib_env.Append(CXXFLAGS = '-DHAVE_CAIRO') lib_env.Append(CXXFLAGS = '-DHAVE_CAIRO')
libmapnik_cxxflags.append('-DHAVE_CAIRO') libmapnik_cxxflags.append('-DHAVE_CAIRO')
lib_env.PrependUnique(CPPPATH=copy(env['CAIRO_CPPPATHS'])) lib_env.AppendUnique(CPPPATH=copy(env['CAIRO_CPPPATHS']))
source.insert(0,'cairo_renderer.cpp') source.insert(0,'cairo_renderer.cpp')
source.insert(0,'cairo_context.cpp') source.insert(0,'cairo_context.cpp')