Commit graph

394 commits

Author SHA1 Message Date
artemp
2b9ce83226 + fix typo 2013-04-23 12:29:43 +01:00
artemp
ea28abf203 Merge branch 'master' into image-readers-c++11
Conflicts:
	bindings/python/mapnik_image.cpp
	include/mapnik/factory.hpp
	include/mapnik/image_reader.hpp
	src/image_reader.cpp
	src/jpeg_reader.cpp
	src/png_reader.cpp
2013-04-22 12:24:09 +01:00
Dane Springmeyer
4c38bf9b81 remove geos plugin (moved to https://github.com/mapnik/non-core-plugins) - refs #1809 2013-04-19 14:09:25 -07:00
artemp
7cd8c63656 + remove "-ansi" compile flags to avoid clashung with -std=c++11 2013-04-19 09:42:24 +01:00
artemp
e59bf22fbd WEBP image reader
+ add initial support
2013-04-15 14:00:41 +01:00
Dane Springmeyer
79a216f349 remove ltdl to reduce dependencies and because calling dlopen/LoadLibrary is easy 2013-04-09 19:37:02 -07:00
kunitoki
3c56ac656a - scons help cosmetics 2013-03-27 09:01:03 +01:00
kunitoki
350ff279ee - avoid treating all CPPDEFINES as a whole in scons 2013-03-26 11:05:02 +01:00
Dane Springmeyer
5af0e95c94 scons: add HOST option, which if set will skip configure checks - in the future it might do more 2013-03-25 11:19:51 -07: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
kunitoki
02fa32ba5e - last commit was wrong 2013-03-06 13:21:53 +01:00
kunitoki
2717d25483 - fix linux project file handling in case where a different PREFIX is specified 2013-03-06 13:13:20 +01:00
Dane Springmeyer
f232d026c3 scons: fix behavior of scons --clean install 2013-02-27 10:37:27 -05:00
Dane Springmeyer
b472cd0e14 scons: enable control of shpindex and svg2png tools 2013-02-22 17:15:29 -08:00
Dane Springmeyer
1b3b598b80 scons: do not attempt to configure if clean requested 2013-02-21 16:42:33 -08:00
Dane Springmeyer
4115903148 fix spelling 2013-02-21 16:34:14 -08:00
artemp
617542c136 Merge remote-tracking branch 'origin/master' into clipper 2013-02-20 10:35:47 +00:00
kunitoki
f7e41eb86c - updated SConstruct 2013-02-19 12:13:53 +01:00
kunitoki
ef955ee924 - automate linux project file generation (and simplify sub projects) 2013-02-19 12:12:13 +01:00
artemp
747305253c + link clipper obj's into core lib 2013-02-19 10:06:59 +00:00
Dane Springmeyer
1356775299 scons: remove uneeded BOOST_SPIRIT_THREADSAFE flag - closes #1706 2013-01-29 17:23:10 -05:00
Dane Springmeyer
afa0c8ad27 configure time option to enable proj4 2013-01-29 02:21:27 -05:00
Dane Springmeyer
b1c1c86346 make PNG and TIFF support optional - closes #1704 2013-01-29 02:17:37 -05:00
Dane Springmeyer
7c5693c169 scons: make python includes a list and sensitive to platform specific directories - closes #1691 and fixes mapnik/mapnik-packaging#66 2013-01-14 16:07:38 -08:00
Dane Springmeyer
6f8a12d29d further fixup the sparsehash usage internally 2013-01-10 17:20:34 -08:00
Dane Springmeyer
6b2b66b894 fix handling/install of sparsehash headers 2013-01-10 09:39:43 -08: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
artemp
f25d4d9279 + implement cairo_context wrapper and remove unnecessary dependencies
( cairomm, libsigc++)
2013-01-09 17:00:30 +00:00
Dane Springmeyer
0121f53f56 refactor and speed up hextree image encoding by using dense_has_map - refs #1629 2013-01-08 19:07:11 -08:00
Dane Springmeyer
82e9f5b68c clear out invalid plugins from source directory to ensure that 'make local' target does not crash 2013-01-04 12:32:53 -08:00
artemp
8da2158781 + allow configure BIGINT support (default: yes) 2013-01-03 16:23:36 +00:00
Dane Springmeyer
665d390021 only build svg_renderer C++ tests if CPP_TESTS=True 2012-12-21 20:02:19 -08:00
Dane Springmeyer
6590225ce0 disable C++ tests for travis build to speed up overall compile 2012-12-19 20:12:13 -08:00
Dane Springmeyer
159dec9aa5 configure python details if building python plugin as well as bindings 2012-12-16 12:23:01 -08:00
Dane Springmeyer
cea31234fa allow building svg_renderer again - refs #1438 2012-11-01 10:07:29 -07:00
Dane Springmeyer
2ded86629f scons: do not invoke any install or uninstall targets if using SYSTEM_FONTS - closes #1481 2012-09-13 13:40:15 -07:00
Dane Springmeyer
f73168a4cc scons: remove helloworld plugin if out of date and make warning yellow not red 2012-09-03 11:29:14 -07:00
Dane Springmeyer
5120d0398d add build file for headers and svg/output code directories to hold the svg_renderer used for output - refs #1438 2012-08-27 17:58:49 -07:00
Dane Springmeyer
13bcd3f17f now working on mapnik v2.2.0-pre 2012-08-23 15:19:56 -07:00
Dane Springmeyer
a25aac80f7 setting up for mapnik v2.1.0 release 2012-08-23 14:50:36 -07:00
Dane Springmeyer
05fdb5424b more fully disable the svg_renderer backend - refs #1438 2012-08-23 10:10:18 -07:00
Dane Springmeyer
1e0a4ace86 scons: add option to configure custom paths to ltdl - refs #1376 2012-08-22 14:59:51 -07:00
Dane Springmeyer
333ab9a37e only build pgsql2sqlite if boost_program_options is available 2012-08-17 09:37:08 -07:00
Dane Springmeyer
9ef6c0dce1 scons: ensure you can build pgsql2sqlite even if the sqlite datasource plugin is not requested 2012-08-16 16:21:10 -07:00
Dane Springmeyer
a986aedd05 remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400 2012-08-16 15:52:32 -07:00
Dane Springmeyer
619af3e3c7 scons: remove boost_python library check - there is not way to include multiple headers and therefore no way to safely include both boost_python and -lpython libs - refs #1394 2012-08-16 14:29:42 -07:00
Dane Springmeyer
57246bb569 scons: better handling of implicit dependencies - also add distclean target - refs #1395, #1324, and #1310 2012-08-16 14:12:49 -07:00
Dane Springmeyer
a3e27ed726 Merge branch 'master' of github.com:mapnik/mapnik 2012-08-16 12:29:27 -07:00
Dane Springmeyer
d850ee8b76 correct various old trac links to point to github - closes #1396 2012-08-16 12:27:58 -07:00
Dane Springmeyer
53685f3f99 scons: create working uninstall target for fonts 2012-08-16 10:05:34 -07:00