scons: explicitly link against libmapnik for command line programs to be built
This commit is contained in:
parent
fa5a2195d7
commit
7418806450
3 changed files with 8 additions and 9 deletions
|
@ -34,13 +34,12 @@ headers = env['CPPPATH']
|
||||||
|
|
||||||
boost_thread = 'boost_thread%s' % env['BOOST_APPEND']
|
boost_thread = 'boost_thread%s' % env['BOOST_APPEND']
|
||||||
|
|
||||||
libraries = [boost_thread]
|
libraries = [boost_thread,'mapnik']
|
||||||
|
|
||||||
if env['CAIRO']:
|
if env['CAIRO']:
|
||||||
libraries.append('cairo')
|
libraries.append('cairo')
|
||||||
|
|
||||||
if env['PLATFORM'] == 'Darwin':
|
if env['PLATFORM'] == 'Darwin':
|
||||||
libraries.append('mapnik')
|
|
||||||
libraries.append('icuuc')
|
libraries.append('icuuc')
|
||||||
libraries.append('icudata')
|
libraries.append('icudata')
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
lib program_options : : <name>boost_program_options-xgcc40-mt <search>/usr/local/lib ;
|
lib program_options : : <name>boost_program_options-mt <search>/opt/local/lib ;
|
||||||
lib pq : : <name>pq <search>/opt/postgresql/lib ;
|
lib pq : : <name>pq <search>/usr/local/pgsql/lib ;
|
||||||
lib sqlite : : <name>sqlite3 <search>/usr/local/lib ;
|
lib sqlite : : <name>sqlite3 <search>/usr/local/lib ;
|
||||||
|
|
||||||
exe pgsql2sqlite :
|
exe pgsql2sqlite :
|
||||||
|
@ -13,9 +13,10 @@ exe pgsql2sqlite :
|
||||||
.//pq
|
.//pq
|
||||||
.//sqlite
|
.//sqlite
|
||||||
:
|
:
|
||||||
<include>/usr/local/include/boost-1_38
|
<include>/usr/local/include/mapnik
|
||||||
<include>/opt/mapnik/include
|
<include>/opt/local/include
|
||||||
|
<include>/usr/local/pgsql/include/
|
||||||
|
<include>/opt/local/include/boost-1_35
|
||||||
<include>../../plugins/input/postgis
|
<include>../../plugins/input/postgis
|
||||||
<include>/opt/postgresql/include
|
|
||||||
#<define>MAPNIK_DEBUG
|
#<define>MAPNIK_DEBUG
|
||||||
;
|
;
|
||||||
|
|
|
@ -36,10 +36,9 @@ headers = ['#plugins/input/postgis'] + env['CPPPATH']
|
||||||
boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
|
boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
|
||||||
boost_thread = 'boost_thread%s' % env['BOOST_APPEND']
|
boost_thread = 'boost_thread%s' % env['BOOST_APPEND']
|
||||||
|
|
||||||
libraries = [boost_program_options,boost_thread,'sqlite3','pq']
|
libraries = [boost_program_options,boost_thread,'sqlite3','pq','mapnik']
|
||||||
|
|
||||||
if env['PLATFORM'] == 'Darwin':
|
if env['PLATFORM'] == 'Darwin':
|
||||||
libraries.append('mapnik')
|
|
||||||
libraries.append('icuuc')
|
libraries.append('icuuc')
|
||||||
libraries.append('icudata')
|
libraries.append('icudata')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue