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

+ added '4' optimization level, enables link-time optimization

Browse source 
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:
Artem Pavlenko 2009-06-30 16:21:12 +00:00
parent 0e7ca8ed44
commit 21d76f574c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -104,7 +104,7 @@ opts = Variables()
opts.AddVariables( opts.AddVariables(
# Compiler options # Compiler options
('CXX', 'The C++ compiler to use (defaults to g++).', 'g++'), ('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 # Note: setting DEBUG=True will override any custom OPTIMIZATION level
BoolVariable('DEBUG', 'Compile a debug version of Mapnik', 'False'), BoolVariable('DEBUG', 'Compile a debug version of Mapnik', 'False'),
BoolVariable('XML_DEBUG', 'Compile a XML verbose 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']: if env['INTERNAL_LIBAGG']:
SConscript('agg/SConscript') SConscript('agg/SConscript')
# Build the core library
SConscript('src/SConscript')
# Build the requested and able-to-be-compiled input plug-ins # Build the requested and able-to-be-compiled input plug-ins
GDAL_BUILT = False GDAL_BUILT = False
OGR_BUILT = False OGR_BUILT = False
@ -880,9 +885,6 @@ for plugin in env['REQUESTED_PLUGINS']:
# build internal shape and raster plugins # build internal shape and raster plugins
SConscript('plugins/input/%s/SConscript' % plugin) SConscript('plugins/input/%s/SConscript' % plugin)
# Build the core library
SConscript('src/SConscript')
# Build the c++ rundemo app if requested # Build the c++ rundemo app if requested
if env['DEMO']: if env['DEMO']:
SConscript('demo/c++/SConscript') SConscript('demo/c++/SConscript')