allow building svg_renderer again - refs #1438
This commit is contained in:
parent
2cf429db08
commit
cea31234fa
2 changed files with 24 additions and 24 deletions
|
@ -325,7 +325,7 @@ opts.AddVariables(
|
|||
|
||||
BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'),
|
||||
|
||||
#BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
|
||||
BoolVariable('SVG_RENDERER', 'build support for native svg renderer', 'False'),
|
||||
|
||||
# Variables for optional dependencies
|
||||
('GEOS_CONFIG', 'The path to the geos-config executable.', 'geos-config'),
|
||||
|
@ -426,7 +426,7 @@ pickle_store = [# Scons internal variables
|
|||
'CAIROMM_LIBPATHS',
|
||||
'CAIROMM_LINKFLAGS',
|
||||
'CAIROMM_CPPPATHS',
|
||||
#'SVG_RENDERER',
|
||||
'SVG_RENDERER',
|
||||
'SQLITE_LINKFLAGS',
|
||||
'BOOST_LIB_VERSION_FROM_HEADER'
|
||||
]
|
||||
|
@ -1745,8 +1745,8 @@ if not HELP_REQUESTED:
|
|||
|
||||
# not currently maintained
|
||||
# https://github.com/mapnik/mapnik/issues/1438
|
||||
#if env['SVG_RENDERER']:
|
||||
# SConscript('tests/cpp_tests/svg_renderer_tests/build.py')
|
||||
if env['SVG_RENDERER']:
|
||||
SConscript('tests/cpp_tests/svg_renderer_tests/build.py')
|
||||
|
||||
# install pkg-config script and mapnik-config script
|
||||
SConscript('utils/mapnik-config/build.py')
|
||||
|
|
40
src/build.py
40
src/build.py
|
@ -286,26 +286,26 @@ source += Split(
|
|||
""")
|
||||
|
||||
# https://github.com/mapnik/mapnik/issues/1438
|
||||
#if env['SVG_RENDERER']: # svg backend
|
||||
# source += Split(
|
||||
# """
|
||||
# svg/output/svg_renderer.cpp
|
||||
# svg/output/svg_generator.cpp
|
||||
# svg/output/svg_output_attributes.cpp
|
||||
# svg/output/process_symbolizers.cpp
|
||||
# svg/output/process_building_symbolizer.cpp
|
||||
# svg/output/process_line_pattern_symbolizer.cpp
|
||||
# svg/output/process_line_symbolizer.cpp
|
||||
# svg/output/process_markers_symbolizer.cpp
|
||||
# svg/output/process_point_symbolizer.cpp
|
||||
# svg/output/process_polygon_pattern_symbolizer.cpp
|
||||
# svg/output/process_polygon_symbolizer.cpp
|
||||
# svg/output/process_raster_symbolizer.cpp
|
||||
# svg/output/process_shield_symbolizer.cpp
|
||||
# svg/output/process_text_symbolizer.cpp
|
||||
# """)
|
||||
# lib_env.Append(CXXFLAGS = '-DSVG_RENDERER')
|
||||
# libmapnik_cxxflags.append('-DSVG_RENDERER')
|
||||
if env['SVG_RENDERER']: # svg backend
|
||||
source += Split(
|
||||
"""
|
||||
svg/output/svg_renderer.cpp
|
||||
svg/output/svg_generator.cpp
|
||||
svg/output/svg_output_attributes.cpp
|
||||
svg/output/process_symbolizers.cpp
|
||||
svg/output/process_building_symbolizer.cpp
|
||||
svg/output/process_line_pattern_symbolizer.cpp
|
||||
svg/output/process_line_symbolizer.cpp
|
||||
svg/output/process_markers_symbolizer.cpp
|
||||
svg/output/process_point_symbolizer.cpp
|
||||
svg/output/process_polygon_pattern_symbolizer.cpp
|
||||
svg/output/process_polygon_symbolizer.cpp
|
||||
svg/output/process_raster_symbolizer.cpp
|
||||
svg/output/process_shield_symbolizer.cpp
|
||||
svg/output/process_text_symbolizer.cpp
|
||||
""")
|
||||
lib_env.Append(CXXFLAGS = '-DSVG_RENDERER')
|
||||
libmapnik_cxxflags.append('-DSVG_RENDERER')
|
||||
|
||||
if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']:
|
||||
source += Split(
|
||||
|
|
Loading…
Reference in a new issue