diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-02 19:49:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-02 19:49:01 +0000 |
| commit | 54c09b137a192995542e922bfb0f7a1925c28ecd (patch) | |
| tree | 97c485608fedfbbfca76a02651eb7d2411bfa409 /SConstruct | |
| parent | 046a5d745a2a62031f3a64fd60adc417ed0170c8 (diff) | |
add -DBOOST_SYSTEM_NO_DEPRECATED when building anything using boost to avoid linkage issues with boost 1.50 and above
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@13590 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 429e8fb843..7ad8cdfe45 100644 --- a/SConstruct +++ b/SConstruct @@ -85,6 +85,7 @@ class LibraryInfo(Environment): self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) self.Append (CCFLAGS = other.get('CCFLAGS', [])) + self.Append (CXXFLAGS = other.get('CXXFLAGS', [])) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) #doing LINKFLAGS breaks -framework @@ -992,7 +993,7 @@ if env['WIIMOTE']: libraries['boost'] = LibraryInfo () prep_libcheck(env, libraries['boost']) -libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") +libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib",CCFLAGS="-DBOOST_SYSTEM_NO_DEPRECATED",CXXFLAGS="-DBOOST_SYSTEM_NO_DEPRECATED") conf = Configure (libraries['boost']) if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False: print "Boost header files do not appear to be installed. You also might be running a buggy version of scons. Try scons 0.97 if you can." |