+ added '4' optimization level, enables link-time optimization
for llvm-gcc (OS X) + build core library first (reverting build order change in r1192 as it broke OS X builds)
This commit is contained in:
parent
0e7ca8ed44
commit
21d76f574c
1 changed files with 6 additions and 4 deletions
10
SConstruct
10
SConstruct
|
@ -104,7 +104,7 @@ opts = Variables()
|
|||
opts.AddVariables(
|
||||
# Compiler options
|
||||
('CXX', 'The C++ compiler to use (defaults to g++).', 'g++'),
|
||||
EnumVariable('OPTIMIZATION','Set g++ optimization level','2', ['0','1','2','3']),
|
||||
EnumVariable('OPTIMIZATION','Set g++ optimization level','2', ['0','1','2','3','4']),
|
||||
# Note: setting DEBUG=True will override any custom OPTIMIZATION level
|
||||
BoolVariable('DEBUG', 'Compile a debug version of Mapnik', 'False'),
|
||||
BoolVariable('XML_DEBUG', 'Compile a XML verbose debug version of mapnik', 'False'),
|
||||
|
@ -862,6 +862,11 @@ Export('env')
|
|||
if env['INTERNAL_LIBAGG']:
|
||||
SConscript('agg/SConscript')
|
||||
|
||||
|
||||
|
||||
# Build the core library
|
||||
SConscript('src/SConscript')
|
||||
|
||||
# Build the requested and able-to-be-compiled input plug-ins
|
||||
GDAL_BUILT = False
|
||||
OGR_BUILT = False
|
||||
|
@ -880,9 +885,6 @@ for plugin in env['REQUESTED_PLUGINS']:
|
|||
# build internal shape and raster plugins
|
||||
SConscript('plugins/input/%s/SConscript' % plugin)
|
||||
|
||||
# Build the core library
|
||||
SConscript('src/SConscript')
|
||||
|
||||
# Build the c++ rundemo app if requested
|
||||
if env['DEMO']:
|
||||
SConscript('demo/c++/SConscript')
|
||||
|
|
Loading…
Reference in a new issue