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

allow building svg_renderer again - refs #1438

Browse source
This commit is contained in:
Dane Springmeyer 2012-11-01 10:07:29 -07:00
parent 2cf429db08
commit cea31234fa
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SConstruct
View file

@ -325,7 +325,7 @@ opts.AddVariables(
BoolVariable('RENDERING_STATS', 'Output rendering statistics during style processing', 'False'), 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 # Variables for optional dependencies
('GEOS_CONFIG', 'The path to the geos-config executable.', 'geos-config'), ('GEOS_CONFIG', 'The path to the geos-config executable.', 'geos-config'),
@ -426,7 +426,7 @@ pickle_store = [# Scons internal variables
'CAIROMM_LIBPATHS', 'CAIROMM_LIBPATHS',
'CAIROMM_LINKFLAGS', 'CAIROMM_LINKFLAGS',
'CAIROMM_CPPPATHS', 'CAIROMM_CPPPATHS',
#'SVG_RENDERER', 'SVG_RENDERER',
'SQLITE_LINKFLAGS', 'SQLITE_LINKFLAGS',
'BOOST_LIB_VERSION_FROM_HEADER' 'BOOST_LIB_VERSION_FROM_HEADER'
] ]
@ -1745,8 +1745,8 @@ if not HELP_REQUESTED:
# not currently maintained # not currently maintained
# https://github.com/mapnik/mapnik/issues/1438 # https://github.com/mapnik/mapnik/issues/1438
#if env['SVG_RENDERER']: if env['SVG_RENDERER']:
# SConscript('tests/cpp_tests/svg_renderer_tests/build.py') SConscript('tests/cpp_tests/svg_renderer_tests/build.py')
# install pkg-config script and mapnik-config script # install pkg-config script and mapnik-config script
SConscript('utils/mapnik-config/build.py') SConscript('utils/mapnik-config/build.py')

40
src/build.py
View file

@ -286,26 +286,26 @@ source += Split(
""") """)
# https://github.com/mapnik/mapnik/issues/1438 # https://github.com/mapnik/mapnik/issues/1438
#if env['SVG_RENDERER']: # svg backend if env['SVG_RENDERER']: # svg backend
# source += Split( source += Split(
# """ """
# svg/output/svg_renderer.cpp svg/output/svg_renderer.cpp
# svg/output/svg_generator.cpp svg/output/svg_generator.cpp
# svg/output/svg_output_attributes.cpp svg/output/svg_output_attributes.cpp
# svg/output/process_symbolizers.cpp svg/output/process_symbolizers.cpp
# svg/output/process_building_symbolizer.cpp svg/output/process_building_symbolizer.cpp
# svg/output/process_line_pattern_symbolizer.cpp svg/output/process_line_pattern_symbolizer.cpp
# svg/output/process_line_symbolizer.cpp svg/output/process_line_symbolizer.cpp
# svg/output/process_markers_symbolizer.cpp svg/output/process_markers_symbolizer.cpp
# svg/output/process_point_symbolizer.cpp svg/output/process_point_symbolizer.cpp
# svg/output/process_polygon_pattern_symbolizer.cpp svg/output/process_polygon_pattern_symbolizer.cpp
# svg/output/process_polygon_symbolizer.cpp svg/output/process_polygon_symbolizer.cpp
# svg/output/process_raster_symbolizer.cpp svg/output/process_raster_symbolizer.cpp
# svg/output/process_shield_symbolizer.cpp svg/output/process_shield_symbolizer.cpp
# svg/output/process_text_symbolizer.cpp svg/output/process_text_symbolizer.cpp
# """) """)
# lib_env.Append(CXXFLAGS = '-DSVG_RENDERER') lib_env.Append(CXXFLAGS = '-DSVG_RENDERER')
# libmapnik_cxxflags.append('-DSVG_RENDERER') libmapnik_cxxflags.append('-DSVG_RENDERER')
if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']: if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']:
source += Split( source += Split(