Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Dropping Magick++ for libpng and pngwriter

Browse Source
This commit is contained in:
DennisOSRM 2012-02-13 16:15:28 +01:00
parent 3c10844067
commit fe416526f2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@ -95,8 +95,8 @@ if not conf.CheckHeader('omp.h'):
if not conf.CheckLibWithHeader('bz2', 'bzlib.h', 'CXX'): if not conf.CheckLibWithHeader('bz2', 'bzlib.h', 'CXX'):
print "bz2 library not found. Exiting" print "bz2 library not found. Exiting"
Exit(-1) Exit(-1)
if not conf.CheckLibWithHeader('libzip', 'zip.h', 'CXX'): if not conf.CheckLibWithHeader('png', 'png.h', 'CXX'):
print "Zip library not found. Exiting" print "png library or header not found. Exiting"
Exit(-1) Exit(-1)
if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'CXX'): if not conf.CheckLibWithHeader('pthread', 'pthread.h', 'CXX'):
print "pthread not found. Exiting" print "pthread not found. Exiting"
@ -120,8 +120,8 @@ if not conf.CheckLibWithHeader('xml2', 'libxml/xmlreader.h', 'CXX'):
if not conf.CheckLibWithHeader('z', 'zlib.h', 'CXX'): if not conf.CheckLibWithHeader('z', 'zlib.h', 'CXX'):
print "zlib library or header not found. Exiting" print "zlib library or header not found. Exiting"
Exit(-1) Exit(-1)
if not conf.CheckLibWithHeader('png', 'png.h', 'CXX'): if not conf.CheckLibWithHeader('zip', 'zip.h', 'CXX'):
print "png library or header not found. Exiting" print "Zip library not found. Exiting"
Exit(-1) Exit(-1)
#Check BOOST installation #Check BOOST installation
if not (conf.CheckBoost('1.41')): if not (conf.CheckBoost('1.41')):
@ -201,6 +201,6 @@ env.Program(target = 'osrm-extract', source = ["extractor.cpp", Glob('DataStruct
env.Program(target = 'osrm-prepare', source = ["createHierarchy.cpp", 'Contractor/EdgeBasedGraphFactory.cpp', Glob('Util/SRTMLookup/*.cpp')]) env.Program(target = 'osrm-prepare', source = ["createHierarchy.cpp", 'Contractor/EdgeBasedGraphFactory.cpp', Glob('Util/SRTMLookup/*.cpp')])
env.Append(CCFLAGS = ['-lboost_regex', '-lboost_iostreams', '-lbz2', '-lz', '-lprotobuf']) env.Append(CCFLAGS = ['-lboost_regex', '-lboost_iostreams', '-lbz2', '-lz', '-lprotobuf'])
env.Append(LINKFLAGS = ['-lboost_system']) env.Append(LINKFLAGS = ['-lboost_system'])
env.Program(target = 'osrm-routed', source = ["routed.cpp", 'Descriptors/DescriptionFactory.cpp'], CCFLAGS = ['-DROUTED']) env.Program(target = 'osrm-routed', source = ["routed.cpp", 'Descriptors/DescriptionFactory.cpp', Glob('ThirdParty/*.cc')], CCFLAGS = ['-DROUTED'])
env = conf.Finish() env = conf.Finish()