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

Removal of v8 as it sucked big time during integration and first

Browse Source 
(partially) working parsing with LUA as the scripting engine.
This commit is contained in:
DennisOSRM
2012-08-29 18:33:18 +02:00
parent 4c58674393
commit 1412c5db42
14 changed files with 901 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SConstruct
+3 -4
View File
@@ -118,6 +118,8 @@ else:
if GetOption('buildconfiguration') != 'debug' and GetOption('nomarch') == None and sys.platform != 'darwin':
env.Append(CCFLAGS = ['-march=native'])
env.ParseConfig('pkg-config --cflags --libs luabind')
if not conf.CheckHeader('omp.h'):
print "Compiler does not support OpenMP. Exiting"
Exit(-1)
@@ -148,9 +150,6 @@ if not (env.Detect('protoc')):
if not conf.CheckLibWithHeader('stxxl', 'stxxl.h', 'CXX'):
print "stxxl library not found. Exiting"
Exit(-1)
if not conf.CheckLibWithHeader('v8', 'v8.h', 'CXX'):
print "v8 library not found. Exiting"
Exit(-1)
if not conf.CheckLibWithHeader('xml2', 'libxml/xmlreader.h', 'CXX'):
print "libxml2 library or header not found. Exiting"
Exit(-1)
@@ -270,7 +269,7 @@ if sys.platform != 'darwin':
env.Append(CCFLAGS = ['-fopenmp'])
env.Append(LINKFLAGS = ['-fopenmp'])
env.Program(target = 'osrm-extract', source = ["extractor.cpp", Glob('Util/*.cpp')])
env.Program(target = 'osrm-extract', source = ["extractor.cpp", Glob('Util/*.cpp'), Glob('Extractor/*.cpp')])
env.Program(target = 'osrm-prepare', source = ["createHierarchy.cpp", Glob('Contractor/*.cpp'), Glob('Util/SRTMLookup/*.cpp'), Glob('Algorithms/*.cpp')])
env.Program(target = 'osrm-routed', source = ["routed.cpp", 'Descriptors/DescriptionFactory.cpp', Glob('ThirdParty/*.cc'), Glob('Server/DataStructures/*.cpp')], CCFLAGS = env['CCFLAGS'] + ['-DROUTED'])
env = conf.Finish()