From 64947f8540e34e3b7bd6915d7de718ff2d506b46 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 3 Jun 2013 18:56:56 -0700 Subject: [PATCH] now working on mapnik v3.0.0-pre --- SConstruct | 2 +- include/mapnik/version.hpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index d58138906..64b25ed15 100644 --- a/SConstruct +++ b/SConstruct @@ -1592,7 +1592,7 @@ if not preconfigured: # fetch the mapnik version header in order to set the # ABI version used to build libmapnik.so on linux in src/build.py abi = conf.GetMapnikLibVersion() - abi_fallback = "2.2.0" + abi_fallback = "3.0.0-pre" if not abi: color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback) abi = abi_fallback diff --git a/include/mapnik/version.hpp b/include/mapnik/version.hpp index e05a3eaeb..cfb3bd0e3 100644 --- a/include/mapnik/version.hpp +++ b/include/mapnik/version.hpp @@ -23,13 +23,13 @@ #ifndef MAPNIK_VERSION_HPP #define MAPNIK_VERSION_HPP -#define MAPNIK_VERSION_IS_RELEASE 1 +#define MAPNIK_VERSION_IS_RELEASE 0 -#define MAPNIK_MAJOR_VERSION 2 -#define MAPNIK_MINOR_VERSION 2 +#define MAPNIK_MAJOR_VERSION 3 +#define MAPNIK_MINOR_VERSION 0 #define MAPNIK_PATCH_VERSION 0 -// translates to 200200 +// translates to 300000 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION) #ifndef MAPNIK_STRINGIFY