Skip to content

Commit 02253ce

Browse files
author
Dane Springmeyer
committed
Revert "drop static libs for json/wkt"
This reverts commit 2d6843a.
1 parent d5ca207 commit 02253ce

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

binding.gyp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@
108108
'defines': ['NOMINMAX','<!@(mapnik-config --defines)'],
109109
'libraries': [
110110
'<!@(mapnik-config --libs)',
111+
'mapnik-wkt.lib',
112+
'mapnik-json.lib',
111113
'<!@(mapnik-config --dep-libs)',
112114
'libprotobuf-lite.lib',
113115
],
@@ -127,6 +129,8 @@
127129
],
128130
'libraries':[
129131
'<!@(mapnik-config --libs)',
132+
'-lmapnik-wkt',
133+
'-lmapnik-json',
130134
'<!@(mapnik-config --ldflags)',
131135
'-lprotobuf-lite',
132136
],

src/mapnik_feature.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@
88
#include <mapnik/unicode.hpp>
99
#include <mapnik/feature_factory.hpp>
1010
#include <mapnik/json/feature_parser.hpp>
11-
#include <mapnik/json/feature_grammar_impl.hpp>
12-
#include <mapnik/json/geometry_grammar_impl.hpp>
13-
#include <mapnik/json/feature_generator_grammar_impl.hpp>
14-
#include <mapnik/json/geometry_generator_grammar_impl.hpp>
15-
#include <mapnik/json/properties_generator_grammar_impl.hpp>
1611
#include <mapnik/value_types.hpp>
1712
#include <mapnik/util/feature_to_geojson.hpp>
1813

src/mapnik_geometry.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
#include <mapnik/geometry_reprojection.hpp>
77
#include <mapnik/util/geometry_to_geojson.hpp>
88
#include <mapnik/util/geometry_to_wkt.hpp>
9-
#include <mapnik/wkt/wkt_generator_grammar_impl.hpp>
10-
#include <mapnik/json/feature_generator_grammar_impl.hpp>
11-
#include <mapnik/json/geometry_generator_grammar_impl.hpp>
12-
#include <mapnik/json/properties_generator_grammar_impl.hpp>
139
#include <mapnik/util/geometry_to_wkb.hpp>
1410

1511
Nan::Persistent<v8::FunctionTemplate> Geometry::constructor;

src/mapnik_vector_tile.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@
3535
#endif
3636
#include <mapnik/box2d.hpp>
3737
#include <mapnik/scale_denominator.hpp>
38-
#include <mapnik/json/feature_generator_grammar_impl.hpp>
39-
#include <mapnik/json/geometry_generator_grammar_impl.hpp>
40-
#include <mapnik/json/properties_generator_grammar_impl.hpp>
4138
#include <mapnik/util/geometry_to_geojson.hpp>
4239
#include <mapnik/util/feature_to_geojson.hpp>
4340
#include <mapnik/feature_kv_iterator.hpp>

0 commit comments

Comments
 (0)