Dane Springmeyer
|
08fa9fd8ec
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
bindings/python/mapnik_building_symbolizer.cpp
bindings/python/mapnik_debug_symbolizer.cpp
bindings/python/mapnik_line_pattern_symbolizer.cpp
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_markers_symbolizer.cpp
bindings/python/mapnik_point_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
bindings/python/mapnik_python.cpp
bindings/python/mapnik_raster_symbolizer.cpp
bindings/python/mapnik_shield_symbolizer.cpp
bindings/python/mapnik_symbolizer.cpp
|
2013-11-07 09:21:05 -08:00 |
|
Dane Springmeyer
|
d0619bc402
|
update copyright year for scons build files
|
2013-11-05 16:54:13 -08:00 |
|
Dane Springmeyer
|
710d558218
|
scons: simplify linkflags/ldflags setting / attempt to fix #2025
|
2013-10-22 16:35:46 -04:00 |
|
Dane Springmeyer
|
4f01eb05b1
|
scons: correctly propagate DEFINES across builds
|
2013-07-23 20:03:00 -04:00 |
|
Dane Springmeyer
|
75f3eaed67
|
scons: more linux static linking fixes
|
2013-07-14 15:26:24 -04:00 |
|
Dane Springmeyer
|
e2c7283522
|
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
|
2013-03-13 19:49:59 -07:00 |
|
Dane Springmeyer
|
94ff584190
|
finish complete removal of any trace of cairomm/libsigc++ - amends f25d4d9279 and closes #1681
|
2013-01-09 12:49:39 -08:00 |
|
Dane Springmeyer
|
ac418a7d4e
|
remote the last references
|
2012-08-27 16:43:40 -07:00 |
|
artemp
|
4b4cfdd462
|
+ link to boost_system if boost_version >= 1.50
|
2012-07-02 18:10:48 +01:00 |
|
Dane Springmeyer
|
f8c58c22c6
|
scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed
|
2012-04-23 12:48:30 -07:00 |
|
Artem Pavlenko
|
b89f5cbbbc
|
update pdsql2sqlite to new feature_impl
|
2012-01-23 08:40:16 +00:00 |
|
Dane Springmeyer
|
3ede1b13db
|
fixup static linking for pgsql2sqlite build
|
2011-12-21 12:58:10 -08:00 |
|
Artem Pavlenko
|
b689670ffd
|
switch back from mapnik2 to mapnik
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
|
2011-11-23 11:33:58 +00:00 |
|
Dane Springmeyer
|
a6608814d0
|
scons: get linking correct to sqlite dependecies if linking is static
|
2011-11-15 12:07:46 -08:00 |
|
Artem Pavlenko
|
c1929716a0
|
+ don't link to LIBMAPNIK_LIBS
|
2011-09-13 11:54:27 +00:00 |
|
Dane Springmeyer
|
22c39d91ba
|
scons: rename all SConscript files to more friendly name of 'build' with a python extension for quick syntax detection in editors
|
2011-08-30 05:32:01 +00:00 |
|