Commit graph

9449 commits

Author SHA1 Message Date
Dane Springmeyer
cfe79a6fe3 make sure postgis test does not run on windows if no server is availabl 2014-08-31 20:09:16 -07:00
Dane Springmeyer
f4ba1eba15 fixup python bootstrapping 2014-08-31 19:16:39 -07:00
Dane Springmeyer
d8f8831417 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-31 17:51:38 -07:00
Dane Springmeyer
1ba744162b Add nik2img.cpp 2014-08-31 17:51:02 -07:00
Dane Springmeyer
afee619e63 support windows in nik2img.cpp 2014-08-31 17:32:48 -07:00
Dane Springmeyer
7dc1aed9ee attempt to workaround other mapnik_value_type->variant bugs 2014-08-31 17:18:15 -07:00
Dane Springmeyer
dcdd580f98 stash notes on getting python tests running 2014-08-31 13:58:38 -07:00
Dane Springmeyer
351c0894fa avoid inconsistent dll linkage warnings with python + switch back to python.org install 2014-08-31 13:58:25 -07:00
Dane Springmeyer
be44b647fa workaround msvs variant init bug 2014-08-31 12:44:12 -07:00
Dane Springmeyer
79c6ab46a5 start fixing visual tests to run on windows 2014-08-31 08:08:52 +00:00
Dane Springmeyer
18d759f0db reference fonts locally for now 2014-08-31 08:08:14 +00:00
Dane Springmeyer
6828dd5b1e get python bindings working 2014-08-31 07:45:26 +00:00
Dane Springmeyer
beaf7a56cc fix linking problems from python 2014-08-31 07:44:41 +00:00
Dane Springmeyer
bfc772f697 attempt to build the python bindings (TODO: symbol errors wrt to swap) 2014-08-31 07:01:06 +00:00
Dane Springmeyer
ddb6e7e007 remove tabs from mapnik.gyp 2014-08-31 06:30:04 +00:00
Dane Springmeyer
5bf866bbcb adapt to zlib and harfbuzz build changes 2014-08-31 04:19:15 +00:00
Dane Springmeyer
603ea3811f Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-08-30 20:05:33 -07:00
Dane Springmeyer
f9e11dabeb simplify agg_basics.h
- remove unused/obsolete asm
 - visual studio since 2010 supports long long and we target 2014 now
2014-08-30 15:39:52 -07:00
Dane Springmeyer
a8017ddae6 fix std:: prefixing for cmath 2014-08-30 15:13:34 -07:00
Dane Springmeyer
7e74967282 fix std:: prefixing for cmath 2014-08-30 15:13:26 -07:00
Dane Springmeyer
8cd198625e remove unused code 2014-08-30 14:30:51 -07:00
Dane Springmeyer
43eb395839 fixup mapnik-config.bat defines and link flags 2014-08-29 19:45:49 -07:00
Dane Springmeyer
6f476410fa Avoid boost auto-link warnings 2014-08-29 19:05:15 -07:00
Dane Springmeyer
d577ef8719 Merge branch 'master' of https://github.com/mapnik/mapnik into 3x-msvs 2014-08-29 18:56:43 -07:00
Dane Springmeyer
c36767af9e msvc 2014 linking fixes 2014-08-29 18:56:03 -07:00
Dane Springmeyer
aba0d790dc start running tests again 2014-08-29 18:53:10 -07:00
Dane Springmeyer
3004dfc8c1 fix conversions test with msvs 2014 2014-08-29 18:52:52 -07:00
Dane Springmeyer
c7f58ee64c clean up harfbuzz->icu interface 2014-08-29 17:41:29 -07:00
Dane Springmeyer
a2927c123b C++11 mode via v140 toolset + libc++ 2014-08-29 16:58:13 -07:00
Dane Springmeyer
6b364aedf1 harfbuzz in mapnik-config.bat 2014-08-29 16:46:38 -07:00
Dane Springmeyer
15356f6320 handle wchar_t UChar typedef on windows 2014-08-29 16:46:23 -07:00
Dane Springmeyer
cc5d80cb4d msvs 2014 built boost libs 2014-08-29 16:45:54 -07:00
Dane Springmeyer
12a45744fb Merge pull request #2403 from mapycz/3.x-fix-vertext_last-warning
fix compiler warning
2014-08-29 11:52:09 -07:00
Jiri Drbalek
21dcb2e2c4 fix compiler warning 2014-08-29 18:18:25 +00:00
Dane Springmeyer
8d7bf7a8da fix imagedata visability on windows 2014-08-29 11:01:04 -07:00
Dane Springmeyer
3638505854 add correct webp lib 2014-08-29 10:35:54 -07:00
artemp
a5925c1f15 remove redundant private copy assignment op 2014-08-29 18:06:08 +01:00
Dane Springmeyer
c5833e8724 run tests after copying mapnik.lib in place 2014-08-29 00:31:10 -07:00
Dane Springmeyer
3f6a5ae246 re-enable harfbuzz shaper 2014-08-29 00:05:34 -07:00
Dane Springmeyer
726d27866c hookk up harfbuzz 2014-08-28 22:18:12 -07:00
Dane Springmeyer
8e8bc6c745 dodge linking error with image_data on windows - refs #2396 2014-08-28 20:52:18 -07:00
Dane Springmeyer
6074e87bbb include optional - fix msvs compile - refs #2396 2014-08-28 19:29:07 -07:00
Dane Springmeyer
8faa358067 Merge pull request #2400 from mapnik/single-pass-json
Drop multi_pass iterator
2014-08-28 19:12:04 -07:00
Dane Springmeyer
6f3b8f969d params: make msvs happy 2014-08-28 19:06:17 -07:00
Dane Springmeyer
e146dee620 c++ style 2014-08-28 19:06:03 -07:00
Dane Springmeyer
b93d0e97e0 remove one more unused function::name that does not compile with msvs 2013 - refs #2396 2014-08-28 18:57:59 -07:00
Dane Springmeyer
324fb11f66 include <cstdint> - fixes msvs compile - refs #2396 2014-08-28 18:51:27 -07:00
Dane Springmeyer
37f4c574f3 remove unused function::name that does not compile with msvs 2013 - refs #2396 2014-08-28 18:49:56 -07:00
Dane Springmeyer
7ff712af52 remove unused code 2014-08-28 17:24:17 -07:00
Dane Springmeyer
3c66054524 Merge branch 'master' of github.com:mapnik/mapnik into 3x-msvs 2014-08-28 17:23:59 -07:00