Applied mapnik-r511.patch from David Siegel:
plugins/input/postgis/SConscript: - added boost_thread-mt to darwin builds demo/c++/rundemo.cpp: - setBackground() is now set_background() bindings/python/SConscript: - added boost_thread-mt to darwin builds - changed builder to LoadableModule which builds a so called "bundle" on darwin and a shared library on all other systems. - LDMODULEPREFIX = '' SConstruct: - freetype-config is now searched in the path.
This commit is contained in:
parent
8b3f5ef483
commit
76572994b5
4 changed files with 10 additions and 3 deletions
|
@ -32,7 +32,7 @@ opts.Add('PREFIX', 'The install path "prefix"', '/usr/local')
|
||||||
opts.Add(PathOption('BOOST_INCLUDES', 'Search path for boost include files', '/usr/include'))
|
opts.Add(PathOption('BOOST_INCLUDES', 'Search path for boost include files', '/usr/include'))
|
||||||
opts.Add(PathOption('BOOST_LIBS', 'Search path for boost library files', '/usr/' + LIBDIR_SCHEMA))
|
opts.Add(PathOption('BOOST_LIBS', 'Search path for boost library files', '/usr/' + LIBDIR_SCHEMA))
|
||||||
opts.Add('BOOST_TOOLKIT','Specify boost toolkit e.g. gcc41.','',False)
|
opts.Add('BOOST_TOOLKIT','Specify boost toolkit e.g. gcc41.','',False)
|
||||||
opts.Add(PathOption('FREETYPE_CONFIG', 'The path to the freetype-config executable.', '/usr/bin/freetype-config'))
|
opts.Add(('FREETYPE_CONFIG', 'The path to the freetype-config executable.', 'freetype-config'))
|
||||||
opts.Add(PathOption('FRIBIDI_INCLUDES', 'Search path for fribidi include files', '/usr/include'))
|
opts.Add(PathOption('FRIBIDI_INCLUDES', 'Search path for fribidi include files', '/usr/include'))
|
||||||
opts.Add(PathOption('FRIBIDI_LIBS','Search path for fribidi include files','/usr/' + LIBDIR_SCHEMA))
|
opts.Add(PathOption('FRIBIDI_LIBS','Search path for fribidi include files','/usr/' + LIBDIR_SCHEMA))
|
||||||
opts.Add(PathOption('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include'))
|
opts.Add(PathOption('PNG_INCLUDES', 'Search path for libpng include files', '/usr/include'))
|
||||||
|
@ -228,3 +228,4 @@ else:
|
||||||
# Install some free default fonts
|
# Install some free default fonts
|
||||||
|
|
||||||
SConscript('fonts/SConscript')
|
SConscript('fonts/SConscript')
|
||||||
|
|
||||||
|
|
|
@ -37,11 +37,15 @@ if env['PLATFORM'] == 'Darwin':
|
||||||
libraries.append('boost_regex%s-mt' % env['BOOST_APPEND'])
|
libraries.append('boost_regex%s-mt' % env['BOOST_APPEND'])
|
||||||
else :
|
else :
|
||||||
libraries.append('boost_regex%s' % env['BOOST_APPEND'])
|
libraries.append('boost_regex%s' % env['BOOST_APPEND'])
|
||||||
|
|
||||||
|
if env['THREADING'] == 'multi':
|
||||||
|
libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
|
||||||
|
|
||||||
linkflags = '-F/ -framework Python'
|
linkflags = '-F/ -framework Python'
|
||||||
|
|
||||||
headers = [env['PYTHON_PREFIX'] + '/include/python' + env['PYTHON_VERSION']] + env['CPPPATH']
|
headers = [env['PYTHON_PREFIX'] + '/include/python' + env['PYTHON_VERSION']] + env['CPPPATH']
|
||||||
|
|
||||||
_mapnik = env.SharedLibrary('_mapnik', glob.glob('*.cpp'), LIBS=libraries, SHLIBPREFIX='', SHLIBSUFFIX='.so', CPPPATH=headers,LINKFLAGS=linkflags)
|
_mapnik = env.LoadableModule('_mapnik', glob.glob('*.cpp'), LIBS=libraries, LDMODULEPREFIX='', LDMODULESUFFIX='.so', CPPPATH=headers,LINKFLAGS=linkflags)
|
||||||
|
|
||||||
paths = """
|
paths = """
|
||||||
mapniklibpath = '%s'
|
mapniklibpath = '%s'
|
||||||
|
|
|
@ -45,7 +45,7 @@ int main ( int argc , char** argv)
|
||||||
freetype_engine::instance()->register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans.ttf");
|
freetype_engine::instance()->register_font("/opt/mapnik/lib/mapnik/fonts/DejaVuSans.ttf");
|
||||||
|
|
||||||
Map m(800,600);
|
Map m(800,600);
|
||||||
m.setBackground(color_factory::from_string("white"));
|
m.set_background(color_factory::from_string("white"));
|
||||||
|
|
||||||
// create styles
|
// create styles
|
||||||
|
|
||||||
|
|
|
@ -36,6 +36,8 @@ libraries = ['pq']
|
||||||
if env['PLATFORM'] == 'Darwin':
|
if env['PLATFORM'] == 'Darwin':
|
||||||
libraries.append('mapnik')
|
libraries.append('mapnik')
|
||||||
libraries.append('iconv')
|
libraries.append('iconv')
|
||||||
|
if env['THREADING'] == 'multi':
|
||||||
|
libraries.append('boost_thread%s-mt' % env['BOOST_APPEND'])
|
||||||
|
|
||||||
postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)
|
postgis_inputdriver = env.SharedLibrary('postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue