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

scons: link zlib last

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-15 00:19:03 -04:00
parent 09aad15eb2
commit 43723d3f81
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/build.py
View file

@ -57,7 +57,7 @@ regex = 'boost_regex%s' % env['BOOST_APPEND']
system = 'boost_system%s' % env['BOOST_APPEND']
# clear out and re-set libs for this env
lib_env['LIBS'] = ['freetype','z',env['ICU_LIB_NAME'],filesystem,system,regex]
lib_env['LIBS'] = ['freetype',env['ICU_LIB_NAME'],filesystem,system,regex]
if env['PROJ']:
lib_env['LIBS'].append('proj')
@ -65,16 +65,17 @@ if env['PROJ']:
if env['PNG']:
lib_env['LIBS'].append('png')
if env['JPEG']:
lib_env['LIBS'].append('jpeg')
if env['TIFF']:
lib_env['LIBS'].append('tiff')
if env['JPEG']:
lib_env['LIBS'].append('jpeg')
if len(env['EXTRA_FREETYPE_LIBS']):
lib_env['LIBS'].extend(copy(env['EXTRA_FREETYPE_LIBS']))
lib_env['LIBS'].append('xml2')
lib_env['LIBS'].append('z')
if env['THREADING'] == 'multi':
lib_env['LIBS'].append('boost_thread%s' % env['BOOST_APPEND'])

2
src/png_reader.cpp
View file

@ -98,7 +98,7 @@ const bool registered2 = register_image_reader("png", create_png_reader2);
void user_error_fn(png_structp png_ptr, png_const_charp error_msg)
{
throw image_reader_exception(std::string("failed to read invalid png: '") + error_msg);
throw image_reader_exception(std::string("failed to read invalid png: '") + error_msg + "'");
}
void user_warning_fn(png_structp png_ptr, png_const_charp warning_msg)