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

resolved multiple #defines

Browse source
This commit is contained in:
Artem Pavlenko 2006-10-27 22:13:13 +00:00
parent 0065ccedeb
commit 77e502c86e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SConstruct
View file

@ -56,7 +56,7 @@ conf = Configure(env)
# Libraries and headers dependency checks # Libraries and headers dependency checks
env['CPPPATH'] = ['#agg/include', '#include', '#'] env['CPPPATH'] = ['#agg/include', '#tinyxml', '#include', '#']
for path in [env['BOOST_INCLUDES'], for path in [env['BOOST_INCLUDES'],
env['PNG_INCLUDES'], env['PNG_INCLUDES'],
@ -145,9 +145,9 @@ env = conf.Finish()
# Setup the c++ args for our own codebase # Setup the c++ args for our own codebase
if env['DEBUG']: if env['DEBUG']:
env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -O0 -fno-inline -g -pthread -DDEBUG') env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -O0 -fno-inline -g -pthread -DDEBUG -DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL')
else: else:
env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -O3 -finline-functions -Wno-inline -pthread -DNDEBUG') env.Append(CXXFLAGS = '-ansi -Wall -ftemplate-depth-100 -O3 -finline-functions -Wno-inline -pthread -DNDEBUG -DBOOST_PROPERTY_TREE_XML_PARSER_TINYXML -DTIXML_USE_STL')
# Build agg first, doesn't need anything special # Build agg first, doesn't need anything special