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

fix cppflag construction

Browse source
This commit is contained in:
Dane Springmeyer 2010-07-19 23:01:52 +00:00
parent eb7da9bcf5
commit 3e06e21189
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/mapnik-config/SConscript
View file

@ -32,7 +32,7 @@ mapnik_libname = 'mapnik2'
filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
regex = 'boost_regex%s' % env['BOOST_APPEND']
private_libs = '-lfreetype -l%s -l%s -l%s' % (env['ICU_LIB_NAME'],filesystem,regex)
private_libs = ' -lfreetype -l%s -l%s -l%s' % (env['ICU_LIB_NAME'],filesystem,regex)
if env['THREADING'] == 'multi':
private_libs += ' -lboost_thread%s' % env['BOOST_APPEND']
@ -41,12 +41,13 @@ if env['HAS_BOOST_SYSTEM']:
private_libs += ' -lboost_system%s' % env['BOOST_APPEND']
if env['HAS_CAIRO']:
private_libs += '-lcairomm-1.0 -lcairo'
private_libs += ' -lcairomm-1.0 -lcairo'
other_libs = private_libs + ' '.join(['-L%s' % i for i in env['LIBPATH'] if not i.startswith('#')])
other_libs = ''.join([' -L%s' % i for i in env['LIBPATH'] if not i.startswith('#')])
other_libs += private_libs
# todo - refine this list
other_includes = ' '.join(['-I%s' % i for i in env['CPPPATH'] if not i.startswith('#')])
other_includes = ''.join([' -I%s' % i for i in env['CPPPATH'] if not i.startswith('#')])
top = '''#!/bin/sh