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

add missing DEFINES to mapnik-config cflags that C++ programs need that compile against mapnik headers including expressions

Browse source
This commit is contained in:
Dane Springmeyer 2011-03-04 22:05:29 +00:00
parent b304302fea
commit a5284bada6
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
utils/mapnik-config/SConscript
View file

@ -38,22 +38,38 @@ svn_revision = env['SVN_REVISION']
filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
regex = 'boost_regex%s' % env['BOOST_APPEND'] regex = 'boost_regex%s' % env['BOOST_APPEND']
# todo - refine this list
other_includes = env['CUSTOM_CXXFLAGS'] + env['CXXFLAGS'] + ''.join([' -I%s' % i for i in env['CPPPATH'] if not i.startswith('#')])
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['HAS_CAIRO']:
private_libs += ' -lcairomm-1.0 -lcairo'
other_includes.append('-DHAVE_CAIRO')
if env['XMLPARSER'] == 'libxml2':
private_libs += ' -lxml2'
if env['THREADING'] == 'multi': if env['THREADING'] == 'multi':
private_libs += ' -lboost_thread%s' % env['BOOST_APPEND'] private_libs += ' -lboost_thread%s' % env['BOOST_APPEND']
if env['HAS_BOOST_SYSTEM']: if env['HAS_BOOST_SYSTEM']:
private_libs += ' -lboost_system%s' % env['BOOST_APPEND'] private_libs += ' -lboost_system%s' % env['BOOST_APPEND']
if env['HAS_CAIRO']: if not env['INTERNAL_LIBAGG']:
private_libs += ' -lcairomm-1.0 -lcairo' for lib in env['LIBS']:
if lib.startswith('agg'):
private_libs += ' -l%s' % lib
if env['SVG_RENDERER']:
other_includes.append('-DSVG_RENDERER')
if env['LIBTOOL_SUPPORTS_ADVISE']:
other_includes.append('-DLIBTOOL_SUPPORTS_ADVISE')
other_libs = env['CUSTOM_LDFLAGS'] + ''.join([' -L%s' % i for i in env['LIBPATH'] if not i.startswith('#')]) other_libs = env['CUSTOM_LDFLAGS'] + ''.join([' -L%s' % i for i in env['LIBPATH'] if not i.startswith('#')])
other_libs += private_libs other_libs += private_libs
# todo - refine this list
other_includes = env['CUSTOM_CXXFLAGS'] + ''.join([' -I%s' % i for i in env['CPPPATH'] if not i.startswith('#')])
top = '''#!/bin/sh top = '''#!/bin/sh