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

- fix in build system to allow GEOS to compile properly

Browse source
This commit is contained in:
Lucio Asnaghi 2010-11-10 11:48:55 +00:00
parent 0066407774
commit 4ce78f4a3f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -223,7 +223,7 @@ PLUGINS = { # plugins with external dependencies
'occi': {'default':False,'path':'OCCI','inc':'occi.h','lib':'ociei','lang':'C++'}, 'occi': {'default':False,'path':'OCCI','inc':'occi.h','lib':'ociei','lang':'C++'},
'sqlite': {'default':False,'path':'SQLITE','inc':'sqlite3.h','lib':'sqlite3','lang':'C'}, 'sqlite': {'default':False,'path':'SQLITE','inc':'sqlite3.h','lib':'sqlite3','lang':'C'},
'rasterlite': {'default':False,'path':'RASTERLITE','inc':['sqlite3.h','rasterlite.h'],'lib':'rasterlite','lang':'C'}, 'rasterlite': {'default':False,'path':'RASTERLITE','inc':['sqlite3.h','rasterlite.h'],'lib':'rasterlite','lang':'C'},
'geos': {'default':False,'path':'GEOS','inc':'geos_c.h','lib':'geos_c','lang':'C'}, 'geos': {'default':False,'path':None,'inc':'geos_c.h','lib':'geos_c','lang':'C'},
# todo: osm plugin does also depend on libxml2 (but there is a separate check for that) # todo: osm plugin does also depend on libxml2 (but there is a separate check for that)
'osm': {'default':False,'path':None,'inc':'curl/curl.h','lib':'curl','lang':'C'}, 'osm': {'default':False,'path':None,'inc':'curl/curl.h','lib':'curl','lang':'C'},

2
plugins/input/geos/SConscript
View file

@ -34,7 +34,7 @@ geos_src = Split(
) )
libraries = [env['PLUGINS']['geos']['lib']] libraries = [env['PLUGINS']['geos']['lib']]
libraries = ['boost_iostreams%s' % env['BOOST_APPEND']] libraries.append(['boost_iostreams%s' % env['BOOST_APPEND']])
if env['PLATFORM'] == 'Darwin': if env['PLATFORM'] == 'Darwin':
libraries.append('mapnik2') libraries.append('mapnik2')