From 1e53351467c2677ace8486e705efb12356e42916 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 24 Apr 2014 12:54:18 -0700 Subject: [PATCH] only compile cpp code if cairo/grid/svg renderers are enabled --- src/cairo_context.cpp | 4 ++++ src/grid/grid.cpp | 4 ++++ src/grid/grid_renderer.cpp | 4 ++++ src/grid/process_building_symbolizer.cpp | 4 ++++ src/grid/process_line_pattern_symbolizer.cpp | 5 +++++ src/grid/process_line_symbolizer.cpp | 4 ++++ src/grid/process_markers_symbolizer.cpp | 4 ++++ src/grid/process_point_symbolizer.cpp | 4 ++++ src/grid/process_polygon_pattern_symbolizer.cpp | 3 +++ src/grid/process_polygon_symbolizer.cpp | 4 ++++ src/grid/process_raster_symbolizer.cpp | 4 ++++ src/grid/process_shield_symbolizer.cpp | 4 ++++ src/grid/process_text_symbolizer.cpp | 3 +++ src/svg/output/process_building_symbolizer.cpp | 4 ++++ src/svg/output/process_line_pattern_symbolizer.cpp | 4 ++++ src/svg/output/process_line_symbolizer.cpp | 5 +++++ src/svg/output/process_markers_symbolizer.cpp | 4 ++++ src/svg/output/process_point_symbolizer.cpp | 4 ++++ src/svg/output/process_polygon_pattern_symbolizer.cpp | 4 ++++ src/svg/output/process_polygon_symbolizer.cpp | 4 ++++ src/svg/output/process_raster_symbolizer.cpp | 4 ++++ src/svg/output/process_shield_symbolizer.cpp | 4 ++++ src/svg/output/process_symbolizers.cpp | 5 +++++ src/svg/output/process_text_symbolizer.cpp | 4 ++++ src/svg/output/svg_generator.cpp | 5 +++++ src/svg/output/svg_output_attributes.cpp | 5 +++++ src/svg/output/svg_renderer.cpp | 4 ++++ 27 files changed, 111 insertions(+) diff --git a/src/cairo_context.cpp b/src/cairo_context.cpp index 220ff2627..7e3bfaad4 100644 --- a/src/cairo_context.cpp +++ b/src/cairo_context.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(HAVE_CAIRO) + #include #include #include @@ -501,3 +503,5 @@ void cairo_context::add_text(text_path const& path, } } + +#endif diff --git a/src/grid/grid.cpp b/src/grid/grid.cpp index a85ae3076..45940dafb 100644 --- a/src/grid/grid.cpp +++ b/src/grid/grid.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -147,3 +149,5 @@ void hit_grid::add_feature(mapnik::feature_impl & feature) template class hit_grid; } + +#endif \ No newline at end of file diff --git a/src/grid/grid_renderer.cpp b/src/grid/grid_renderer.cpp index 682934aa5..ab8d51ae0 100644 --- a/src/grid/grid_renderer.cpp +++ b/src/grid/grid_renderer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -212,3 +214,5 @@ void grid_renderer::render_marker(mapnik::feature_impl & feature, unsigned in template class grid_renderer; } + +#endif \ No newline at end of file diff --git a/src/grid/process_building_symbolizer.cpp b/src/grid/process_building_symbolizer.cpp index 5e089d272..eabad49bd 100644 --- a/src/grid/process_building_symbolizer.cpp +++ b/src/grid/process_building_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -159,3 +161,5 @@ template void grid_renderer::process(building_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_line_pattern_symbolizer.cpp b/src/grid/process_line_pattern_symbolizer.cpp index 42684e57a..fecceab24 100644 --- a/src/grid/process_line_pattern_symbolizer.cpp +++ b/src/grid/process_line_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -137,3 +139,6 @@ template void grid_renderer::process(line_pattern_symbolizer const&, proj_transform const&); } + +#endif + diff --git a/src/grid/process_line_symbolizer.cpp b/src/grid/process_line_symbolizer.cpp index 737d92def..d7c4972b7 100644 --- a/src/grid/process_line_symbolizer.cpp +++ b/src/grid/process_line_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -120,3 +122,5 @@ template void grid_renderer::process(line_symbolizer const&, } +#endif + diff --git a/src/grid/process_markers_symbolizer.cpp b/src/grid/process_markers_symbolizer.cpp index 1bc66ca36..c042e0e4a 100644 --- a/src/grid/process_markers_symbolizer.cpp +++ b/src/grid/process_markers_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + /* porting notes --> @@ -257,3 +259,5 @@ template void grid_renderer::process(markers_symbolizer const&, mapnik::feature_impl &, proj_transform const&); } + +#endif diff --git a/src/grid/process_point_symbolizer.cpp b/src/grid/process_point_symbolizer.cpp index 3d0d68f40..cd77601da 100644 --- a/src/grid/process_point_symbolizer.cpp +++ b/src/grid/process_point_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -120,3 +122,5 @@ template void grid_renderer::process(point_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_polygon_pattern_symbolizer.cpp b/src/grid/process_polygon_pattern_symbolizer.cpp index ec75b42b2..381ad7b10 100644 --- a/src/grid/process_polygon_pattern_symbolizer.cpp +++ b/src/grid/process_polygon_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // boost #include @@ -114,3 +116,4 @@ template void grid_renderer::process(polygon_pattern_symbolizer const&, } +#endif diff --git a/src/grid/process_polygon_symbolizer.cpp b/src/grid/process_polygon_symbolizer.cpp index f6508fd2f..cce867f0d 100644 --- a/src/grid/process_polygon_symbolizer.cpp +++ b/src/grid/process_polygon_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // boost #include @@ -99,3 +101,5 @@ template void grid_renderer::process(polygon_symbolizer const&, } +#endif + diff --git a/src/grid/process_raster_symbolizer.cpp b/src/grid/process_raster_symbolizer.cpp index da923d9e9..9bc262f58 100644 --- a/src/grid/process_raster_symbolizer.cpp +++ b/src/grid/process_raster_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -41,3 +43,5 @@ template void grid_renderer::process(raster_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_shield_symbolizer.cpp b/src/grid/process_shield_symbolizer.cpp index 0fab6d5e1..d34e45a50 100644 --- a/src/grid/process_shield_symbolizer.cpp +++ b/src/grid/process_shield_symbolizer.cpp @@ -21,6 +21,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -92,3 +94,5 @@ template void grid_renderer::process(shield_symbolizer const&, proj_transform const&); } + +#endif diff --git a/src/grid/process_text_symbolizer.cpp b/src/grid/process_text_symbolizer.cpp index 40e6ed5a3..f596c466e 100644 --- a/src/grid/process_text_symbolizer.cpp +++ b/src/grid/process_text_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(GRID_RENDERER) + // mapnik #include #include @@ -67,3 +69,4 @@ template void grid_renderer::process(text_symbolizer const&, } +#endif diff --git a/src/svg/output/process_building_symbolizer.cpp b/src/svg/output/process_building_symbolizer.cpp index 23f602b17..c0ff9f423 100644 --- a/src/svg/output/process_building_symbolizer.cpp +++ b/src/svg/output/process_building_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(building_symbo mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_line_pattern_symbolizer.cpp b/src/svg/output/process_line_pattern_symbolizer.cpp index 42156c1d2..e41c996d8 100644 --- a/src/svg/output/process_line_pattern_symbolizer.cpp +++ b/src/svg/output/process_line_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(line_pattern_s mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_line_symbolizer.cpp b/src/svg/output/process_line_symbolizer.cpp index 6f2008408..c912def11 100644 --- a/src/svg/output/process_line_symbolizer.cpp +++ b/src/svg/output/process_line_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -46,3 +48,6 @@ template void svg_renderer >::process(line_symbolize mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif + diff --git a/src/svg/output/process_markers_symbolizer.cpp b/src/svg/output/process_markers_symbolizer.cpp index 67c1fe5ed..7f97c52e0 100644 --- a/src/svg/output/process_markers_symbolizer.cpp +++ b/src/svg/output/process_markers_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(markers_symbol mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_point_symbolizer.cpp b/src/svg/output/process_point_symbolizer.cpp index b737bf37e..bde46cdd7 100644 --- a/src/svg/output/process_point_symbolizer.cpp +++ b/src/svg/output/process_point_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(point_symboliz mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_polygon_pattern_symbolizer.cpp b/src/svg/output/process_polygon_pattern_symbolizer.cpp index f164044a9..c64a07b7d 100644 --- a/src/svg/output/process_polygon_pattern_symbolizer.cpp +++ b/src/svg/output/process_polygon_pattern_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(polygon_patter mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_polygon_symbolizer.cpp b/src/svg/output/process_polygon_symbolizer.cpp index 43ca9bdf8..6ef961c70 100644 --- a/src/svg/output/process_polygon_symbolizer.cpp +++ b/src/svg/output/process_polygon_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -41,3 +43,5 @@ template void svg_renderer >::process(polygon_symbol mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_raster_symbolizer.cpp b/src/svg/output/process_raster_symbolizer.cpp index a659fe58f..b325a8223 100644 --- a/src/svg/output/process_raster_symbolizer.cpp +++ b/src/svg/output/process_raster_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(raster_symboli mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_shield_symbolizer.cpp b/src/svg/output/process_shield_symbolizer.cpp index 1fa981db6..db633d9e6 100644 --- a/src/svg/output/process_shield_symbolizer.cpp +++ b/src/svg/output/process_shield_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(shield_symboli mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/process_symbolizers.cpp b/src/svg/output/process_symbolizers.cpp index ca38a082f..caafb4feb 100644 --- a/src/svg/output/process_symbolizers.cpp +++ b/src/svg/output/process_symbolizers.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -92,3 +94,6 @@ template bool svg_renderer >::process(rule::symboliz proj_transform const& prj_trans); } + +#endif + diff --git a/src/svg/output/process_text_symbolizer.cpp b/src/svg/output/process_text_symbolizer.cpp index 45bc8bf3b..b21f24df1 100644 --- a/src/svg/output/process_text_symbolizer.cpp +++ b/src/svg/output/process_text_symbolizer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -37,3 +39,5 @@ template void svg_renderer >::process(text_symbolize mapnik::feature_impl & feature, proj_transform const& prj_trans); } + +#endif diff --git a/src/svg/output/svg_generator.cpp b/src/svg/output/svg_generator.cpp index e5e2f7a84..ac53dc583 100644 --- a/src/svg/output/svg_generator.cpp +++ b/src/svg/output/svg_generator.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include #include @@ -102,3 +104,6 @@ namespace mapnik { namespace svg { template class svg_generator >; }} + +#endif + diff --git a/src/svg/output/svg_output_attributes.cpp b/src/svg/output/svg_output_attributes.cpp index 544b280ad..972fbb766 100644 --- a/src/svg/output/svg_output_attributes.cpp +++ b/src/svg/output/svg_output_attributes.cpp @@ -21,6 +21,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include @@ -288,3 +290,6 @@ namespace mapnik { namespace svg { svg_namespace_url_ = SVG_NAMESPACE_URL; } }} + +#endif + diff --git a/src/svg/output/svg_renderer.cpp b/src/svg/output/svg_renderer.cpp index 49ce2b4db..856a20a4f 100644 --- a/src/svg/output/svg_renderer.cpp +++ b/src/svg/output/svg_renderer.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SVG_RENDERER) + // mapnik #include #include @@ -117,3 +119,5 @@ void svg_renderer::end_layer_processing(layer const& lay) template class svg_renderer >; } + +#endif