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

scons: hack to make sure makefile pre-build does not break if grid or cairo renderers are not enabled

Browse source
This commit is contained in:
Dane Springmeyer 2015-01-27 22:17:30 -08:00
parent cbb364085f
commit 4e5fa8490a
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/build.py
View file

@ -274,25 +274,32 @@ if env['PLUGIN_LINKING'] == 'static':
lib_env.Append(CPPDEFINES = '-DMAPNIK_STATIC_PLUGINS')
libmapnik_defines.append('-DMAPNIK_STATIC_PLUGINS')
# add these to the compile flags no matter what
# to make it safe to try to compile them from Makefile wrapper
source += Split("""
cairo/process_markers_symbolizer.cpp
cairo/process_group_symbolizer.cpp
""")
if env['HAS_CAIRO']:
lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS'])
lib_env.Append(CPPDEFINES = '-DHAVE_CAIRO')
libmapnik_defines.append('-DHAVE_CAIRO')
lib_env.AppendUnique(CPPPATH=copy(env['CAIRO_CPPPATHS']))
source.append('cairo/cairo_context.cpp')
source.append('cairo/cairo_renderer.cpp')
source.append('cairo/cairo_render_vector.cpp')
source.append('cairo/process_markers_symbolizer.cpp')
source.append('cairo/process_text_symbolizer.cpp')
source.append('cairo/process_group_symbolizer.cpp')
source.append('cairo/process_line_symbolizer.cpp')
source.append('cairo/process_line_pattern_symbolizer.cpp')
source.append('cairo/process_polygon_symbolizer.cpp')
source.append('cairo/process_polygon_pattern_symbolizer.cpp')
source.append('cairo/process_debug_symbolizer.cpp')
source.append('cairo/process_point_symbolizer.cpp')
source.append('cairo/process_raster_symbolizer.cpp')
source.append('cairo/process_building_symbolizer.cpp')
source += Split("""
cairo/cairo_context.cpp
cairo/cairo_renderer.cpp
cairo/cairo_render_vector.cpp
cairo/process_text_symbolizer.cpp
cairo/process_line_symbolizer.cpp
cairo/process_line_pattern_symbolizer.cpp
cairo/process_polygon_symbolizer.cpp
cairo/process_polygon_pattern_symbolizer.cpp
cairo/process_debug_symbolizer.cpp
cairo/process_point_symbolizer.cpp
cairo/process_raster_symbolizer.cpp
cairo/process_building_symbolizer.cpp
""")
for cpp in enabled_imaging_libraries:
source.append(cpp)

4
src/grid/process_group_symbolizer.cpp
View file

@ -20,6 +20,8 @@
*
*****************************************************************************/
#if defined(GRID_RENDERER)
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/grid/grid_rasterizer.hpp>
@ -179,3 +181,5 @@ template void grid_renderer<grid>::process(group_symbolizer const&,
proj_transform const&);
}
#endif