From a2151c8e131579c6657629c13b565d4dd7cc719c Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 23 Feb 2010 03:41:39 +0000 Subject: [PATCH] fix up rundemo, allowing compilation on osx and using expression in text_symbolizer --- demo/c++/SConscript | 2 ++ demo/c++/rundemo.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/demo/c++/SConscript b/demo/c++/SConscript index c5bf402ff..2fa83c29d 100644 --- a/demo/c++/SConscript +++ b/demo/c++/SConscript @@ -33,6 +33,7 @@ source = Split( headers = env['CPPPATH'] boost_thread = 'boost_thread%s' % env['BOOST_APPEND'] +boost_regex = 'boost_regex%s' % env['BOOST_APPEND'] libraries = [boost_thread,'mapnik'] @@ -41,6 +42,7 @@ if '-DHAVE_CAIRO' in env['CXXFLAGS']: libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')]) if env['PLATFORM'] == 'Darwin': + libraries.append(boost_regex) libraries.append(env['ICU_LIB_NAME']) rundemo = env.Program('rundemo', source, CPPPATH=headers, LIBS=libraries) diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp index e26cbff0c..48c3fc0ed 100644 --- a/demo/c++/rundemo.cpp +++ b/demo/c++/rundemo.cpp @@ -162,7 +162,7 @@ int main ( int argc , char** argv) feature_type_style popplaces_style; rule_type popplaces_rule; - text_symbolizer popplaces_text_symbolizer("GEONAME","DejaVu Sans Book",10,color(0,0,0)); + text_symbolizer popplaces_text_symbolizer(parse_expression("GEONAME"),"DejaVu Sans Book",10,color(0,0,0)); popplaces_text_symbolizer.set_halo_fill(color(255,255,200)); popplaces_text_symbolizer.set_halo_radius(1); popplaces_rule.append(popplaces_text_symbolizer);