+ link clipper obj's into core lib
This commit is contained in:
parent
90b0e65841
commit
747305253c
6 changed files with 41 additions and 2 deletions
|
@ -1296,7 +1296,7 @@ if not preconfigured:
|
||||||
# prepend to make sure we link locally
|
# prepend to make sure we link locally
|
||||||
env.Prepend(CPPPATH = '#deps/agg/include')
|
env.Prepend(CPPPATH = '#deps/agg/include')
|
||||||
env.Prepend(LIBPATH = '#deps/agg')
|
env.Prepend(LIBPATH = '#deps/agg')
|
||||||
|
env.Prepend(CPPPATH = '#deps/clipper/include')
|
||||||
# prepend deps dir for auxillary headers
|
# prepend deps dir for auxillary headers
|
||||||
env.Prepend(CPPPATH = '#deps')
|
env.Prepend(CPPPATH = '#deps')
|
||||||
|
|
||||||
|
|
32
deps/clipper/build.py
vendored
Normal file
32
deps/clipper/build.py
vendored
Normal file
|
@ -0,0 +1,32 @@
|
||||||
|
# This file is part of Mapnik (c++ mapping toolkit)
|
||||||
|
# Copyright (C) 2013 Artem Pavlenko
|
||||||
|
#
|
||||||
|
# Mapnik is free software; you can redistribute it and/or
|
||||||
|
# modify it under the terms of the GNU General Public License
|
||||||
|
# as published by the Free Software Foundation; either version 2
|
||||||
|
# of the License, or any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program; if not, write to the Free Software
|
||||||
|
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
import os
|
||||||
|
from glob import glob
|
||||||
|
|
||||||
|
Import('env')
|
||||||
|
|
||||||
|
clipper_env = env.Clone()
|
||||||
|
|
||||||
|
if env['SUNCC']:
|
||||||
|
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O -KPIC -DNDEBUG'
|
||||||
|
else:
|
||||||
|
cxxflags = env['CUSTOM_CXXFLAGS'] + ' -O%s -fPIC -DNDEBUG' % env['OPTIMIZATION']
|
||||||
|
|
||||||
|
clipper_env.StaticLibrary('clipper', ['./src/clipper.cpp',], LIBS=[], CXXFLAGS=cxxflags, LINKFLAGS=env['CUSTOM_LDFLAGS'])
|
3
deps/mapnik/build.py
vendored
3
deps/mapnik/build.py
vendored
|
@ -6,7 +6,8 @@ Import('env')
|
||||||
subdirs = {
|
subdirs = {
|
||||||
'sparsehash':'sparsehash',
|
'sparsehash':'sparsehash',
|
||||||
'sparsehash/internal':'sparsehash/internal',
|
'sparsehash/internal':'sparsehash/internal',
|
||||||
'../agg/include':'agg'
|
'../agg/include':'agg',
|
||||||
|
'../clipper/include':'agg'
|
||||||
}
|
}
|
||||||
|
|
||||||
if 'install' in COMMAND_LINE_TARGETS:
|
if 'install' in COMMAND_LINE_TARGETS:
|
||||||
|
|
|
@ -231,6 +231,12 @@ source += Split(
|
||||||
"""
|
"""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# clipper
|
||||||
|
source += Split(
|
||||||
|
"""
|
||||||
|
../deps/clipper/src/clipper.cpp
|
||||||
|
""")
|
||||||
|
|
||||||
if env['RUNTIME_LINK'] == "static":
|
if env['RUNTIME_LINK'] == "static":
|
||||||
source += glob.glob('../deps/agg/src/' + '*.cpp')
|
source += glob.glob('../deps/agg/src/' + '*.cpp')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue