sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/mapnik/mapnik into cmake-support

Browse source
This commit is contained in:
Mathis Logemann 2021-03-26 20:04:30 +01:00
commit 8cd78b6945
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -1720,7 +1720,7 @@ if not preconfigured:
env['SKIPPED_DEPS'].append('proj-min-version') env['SKIPPED_DEPS'].append('proj-min-version')
else: else:
env.Append(CPPDEFINES = define) env.Append(CPPDEFINES = define)
env.Append(CPPDEFINES = "-DPROJ_VERSION=%d" % version) env.Append(CPPDEFINES = "-DMAPNIK_PROJ_VERSION=%d" % version)
else: else:
env.Append(CPPDEFINES = define) env.Append(CPPDEFINES = define)
else: else:

2
include/mapnik/projection.hpp
View file

@ -39,7 +39,7 @@ MAPNIK_DISABLE_WARNING_POP
// fwd decl // fwd decl
#if PROJ_VERSION >= 80000 #if MAPNIK_PROJ_VERSION >= 80000
struct pj_ctx; struct pj_ctx;
using PJ_CONTEXT = struct pj_ctx; using PJ_CONTEXT = struct pj_ctx;
#else #else