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

remove env clone and instead just push DHAVE_LIBXML2 into main CPPDEFINES

Browse source
This commit is contained in:
Dane Springmeyer 2014-01-27 12:25:51 -08:00
parent 777e067770
commit 18dbf34b72
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/build.py
View file

@ -367,17 +367,8 @@ if env['XMLPARSER'] == 'libxml2' and env['HAS_LIBXML2']:
"""
libxml2_loader.cpp
""")
env2 = lib_env.Clone()
env2.Append(CPPDEFINES = '-DHAVE_LIBXML2')
lib_env.Append(CPPDEFINES = '-DHAVE_LIBXML2')
libmapnik_defines.append('-DHAVE_LIBXML2')
fixup = ['libxml2_loader.cpp']
for cpp in fixup:
if cpp in source:
source.remove(cpp)
if env['LINKING'] == 'static':
source.insert(0,env2.StaticObject(cpp))
else:
source.insert(0,env2.SharedObject(cpp))
else:
source += Split(
"""