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

Further adjustments for OS X

Browse Source
This commit is contained in:
DennisOSRM 2012-02-27 11:51:59 +01:00
parent 3f7437fec2
commit fdb4198c0d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -2,6 +2,7 @@
import os import os
import os.path import os.path
import string
import sys import sys
from subprocess import call from subprocess import call
@ -61,7 +62,7 @@ conf = Configure(env, custom_tests = { 'CheckBoost' : CheckBoost, 'CheckProtobuf
if GetOption('cxx') is None: if GetOption('cxx') is None:
#default Compiler #default Compiler
print 'Using default C++ Compiler: ', env['CXX'] print 'Using default C++ Compiler: ', env['CXX'].strip()
else: else:
env.Replace(CXX = GetOption('cxx')) env.Replace(CXX = GetOption('cxx'))
print 'Using user supplied C++ Compiler: ', env['CXX'] print 'Using user supplied C++ Compiler: ', env['CXX']
@ -74,7 +75,8 @@ else:
if sys.platform == 'darwin': #Mac OS X if sys.platform == 'darwin': #Mac OS X
#os x default installations #os x default installations
env.Append(CPPPATH = ['/usr/include/libxml2'] ) env.Append(CPPPATH = ['/usr/include/libxml2'] )
env.Append(CPPPATH = ["/usr/X11/include"]) #comes with os x env.Append(CPPPATH = ['/usr/X11/include']) #comes with os x
env.Append(LIBPATH = ['/usr/X11/lib']) #needed for libpng
#assume stxxl and boost are installed via homebrew. call brew binary to get folder locations #assume stxxl and boost are installed via homebrew. call brew binary to get folder locations
import subprocess import subprocess
@ -104,7 +106,7 @@ else:
Exit(-1) Exit(-1)
#Check if architecture optimizations shall be turned off #Check if architecture optimizations shall be turned off
if GetOption('buildconfiguration') != 'debug' and GetOption('nomarch') == None: if GetOption('buildconfiguration') != 'debug' and GetOption('nomarch') == None and sys.platform != 'darwin':
env.Append(CCFLAGS = ['-march=native']) env.Append(CCFLAGS = ['-march=native'])
if not conf.CheckHeader('omp.h'): if not conf.CheckHeader('omp.h'):