Commit graph

109 commits

Author SHA1 Message Date
Dane Springmeyer
777e067770 remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082 2014-01-27 12:24:20 -08:00
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
75f3eaed67 scons: more linux static linking fixes 2013-07-14 15:26:24 -04:00
Dane Springmeyer
e02a4ebd9d shapeindex: if statically linking then bring in mapnik dep libs 2013-07-14 13:01:26 -04:00
Dane Springmeyer
0365d3e081 start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
Dane Springmeyer
bdc262d711 remove old versioning strings 2013-03-13 13:06:10 -07:00
Dane Springmeyer
ac418a7d4e remote the last references 2012-08-27 16:43:40 -07:00
Dane Springmeyer
c272835335 yet another -fpermissive - refs #1082, #950 and #1001 2012-02-14 12:03:44 -08:00
Matt Amos
38e7b7cce0 Still need to increment pos counter in shapeindex even when the geometry is null, otherwise reads are possible beyond the end of file. 2012-02-10 15:21:02 +00:00
Dane Springmeyer
39d199aa49 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
15949b077a quadtree: remove unused variable 2011-11-02 13:30:40 -04:00
Dane Springmeyer
d8f19fab05 always link to boost system - closes #931 2011-10-25 19:29:51 -07: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
Dane Springmeyer
6cb31bd109 scons: better propagation of libmapnik build flags to command line utilities and mapnik-config - also remove conditional flags on specific cairo rendering .cpp files as this was not working right - closes #837 2011-08-29 21:12:22 +00:00
Dane Springmeyer
3e67c1d694 scons: centralize install path info 2011-08-12 21:31:28 +00:00
Dane Springmeyer
915a77a2f7 scons: use different constructions environment to avoid potential conflict when building libmapnik.a 2011-08-12 17:09:22 +00:00
Artem Pavlenko
3436fe0f05 + handle null shapes 2011-08-12 16:43:12 +00:00
Artem Pavlenko
d1903cb463 + don't link to boost::iostreams 2011-04-07 15:34:33 +00:00
Artem Pavlenko
0e0b7a578c + implement memory mapping using boost::interprocess
+ cache mapped memory regions for re-use
2011-04-06 13:02:31 +00:00
Dane Springmeyer
c5833a6db8 remove unmaintained autotools scripts 2011-02-04 22:22:16 +00:00
Dane Springmeyer
65e96cf2b7 more cleanup after removal of unneeded cpp file 'shapefile.cpp' 2011-01-05 02:07:12 +00:00
Lucio Asnaghi
e53b490167 - added verbose option to shapeindex 2010-11-10 11:55:22 +00:00
Dane Springmeyer
523b09701e Add the ability to pass custom CXXFLAGS and LDFLAGS that will be prioritized above other compiler and linker flags 2010-09-18 18:02:15 +00:00
Dane Springmeyer
26e4fedfde be careful with output streams 2010-07-22 01:16:48 +00:00
Dane Springmeyer
a4872eb522 add tweak to uninstall target missed in r2036 2010-07-18 20:40:15 +00:00
Dane Springmeyer
200e9096e9 strip the file extention of '.shp', if provided, as the shapefile driver does not expect the ext. This allows a directory of shapefiles to be indexed like: 2010-07-16 23:28:53 +00:00
Artem Pavlenko
246731874b + apply 'mapnik-format' to *.cpp *.hpp 2010-06-02 11:03:30 +00:00
Dane Springmeyer
07186fc6bb ensure shapeindex links against boost system if available (boost >=1.35) to avoid potential problems in indirect linking on linux (essentially directly dynamically linking like we previously only did on os x) - closes #517 2010-02-21 01:00:09 +00:00
Dane Springmeyer
c30ceb1be4 improve shapeindex support for pointz 2010-01-30 01:02:04 +00:00
Artem Pavlenko
47dc1e197b + merge mapnik2 to trunk 2009-12-16 20:02:06 +00:00
Lucio Asnaghi
9ad5b5bfd2 - make quadtree.hpp compile in newer gcc ( closing #418 ) 2009-12-04 14:25:51 +00:00
Dane Springmeyer
291a78209a link to boost system on solaris - modified patch from River Tarnell 2009-12-03 17:06:25 +00:00
Dane Springmeyer
618fa0d2c0 restore compilation to shapeindex on mac os x after r1113 2009-04-29 00:06:10 +00:00
Lucio Asnaghi
58132598f9 + shapeindex: gracefully exit when a shape file doesn't exists (closing #321) 2009-04-28 19:54:34 +00:00
Andreas Volz
42d659a19f compile utils with autotools 2009-04-04 16:33:25 +00:00
Artem Pavlenko
48a13f8cbc appled boost_append_osx_patch_v3 from jbronn 2008-12-04 23:20:44 +00:00
Artem Pavlenko
3f9127b5d0 reverting back to 700 2008-06-29 10:58:29 +00:00
Artem Pavlenko
3275cf9ce6 applied font fallbacj patch from Beau Gunderson 2008-06-29 10:40:08 +00:00
Artem Pavlenko
24c605e807 added missing std namespace 2008-02-20 09:57:37 +00:00
Artem Pavlenko
a478089bd9 patch from Martijn van Oosterhout 2008-02-20 09:34:48 +00:00
Artem Pavlenko
a8859645b3 use memory mapped files for reading shape files 2008-02-04 11:12:32 +00:00
Artem Pavlenko
3c5b7f02f3 applied freebsd patch from Beau Gunderson 2008-01-28 14:51:10 +00:00
svn
b98faab018 respect 'THREADING' flag 2007-09-01 09:50:06 +00:00
Artem Pavlenko
d78ccbaed0 small fix 2007-08-01 08:52:18 +00:00
Artem Pavlenko
15e73b98f4 small formatting 2007-06-05 09:10:40 +00:00
Artem Pavlenko
e0d243dcec 1.Added support for building on Darwin (Xcode 2.4.1, gcc4.0.1).
Mainly taming gcc4.0.1 (anonymous enum bug)

2.Input plug-ins now have .input extension on all platforms
2007-03-16 10:11:37 +00:00
Jean-Francois Doyon
3edbb1f284 - Fix a couple of namespace issues. 2007-02-08 00:36:14 +00:00
Artem Pavlenko
31442b6bac Added DESTDIR option which is used as an additional prefix for the purposes of
installing files. It is useful for binary distributions (eg
RPM etc). Thanks to Dominic Hargreaves!
2006-12-17 12:05:47 +00:00
Artem Pavlenko
ebdd0f6030 disable clog printing in release mode. Pass -DMAPNIK_DEBUG to enable. 2006-11-19 17:13:33 +00:00
Artem Pavlenko
992af4747d 1. move include to mapnik/include
2. update demos,bibdibgs etc.
2006-10-04 11:22:18 +00:00
Artem Pavlenko
4a5a1580c4 fixed 2006-05-12 16:35:36 +00:00
Artem Pavlenko
61fd258fd1 changing licence from GPL to LGPL 2006-03-31 10:32:02 +00:00
Artem Pavlenko
0e53e23ec1 fixed pointz/pointm reading 2006-03-28 10:09:24 +00:00
Artem Pavlenko
8986108775 added set_datasource method (TODO!!!)
fixed pointz in shapeindex
2006-03-28 08:29:36 +00:00
Artem Pavlenko
58675f6bf1 replaced cerr and cout with clog ( redirected to cerr by default) 2006-03-19 21:54:40 +00:00
Jean-Francois Doyon
9f9e4c1d8e Reworked the way the tail end of the boost libs (i.e. -gcc-mt) is handled.
This will eventually help with mroe platforms, and to link with debug libraries.
2006-02-06 01:08:32 +00:00
Artem Pavlenko
d8dc53bcf4 new build system 2006-01-31 23:09:52 +00:00