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
This commit is contained in:
Paul Davis 2012-12-02 19:49:01 +00:00
parent 046a5d745a
commit 54c09b137a
6 changed files with 13 additions and 6 deletions

View File

@ -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."

View File

@ -54,7 +54,8 @@ gtkardour.Merge ([
libraries['vamphost'],
libraries['vamp'],
libraries['xml'],
libraries['xslt']
libraries['xslt'],
libraries['boost']
])
gtkmmtests.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
@ -67,7 +68,8 @@ gtkmmtests.Merge ([
libraries['gtk2'],
libraries['gtkmm2'],
libraries['pangomm'],
libraries['sigc2']
libraries['sigc2'],
libraries['boost']
])
if gtkardour['DMALLOC']:

View File

@ -333,7 +333,8 @@ ardour.Merge ([
libraries['sndfile'],
libraries['vamp'],
libraries['vamphost'],
libraries['xml']
libraries['xml'],
libraries['boost']
])
if ardour['RUBBERBAND']:

View File

@ -59,6 +59,7 @@ if conf.CheckCHeader('execinfo.h'):
pbd = conf.Finish()
pbd.Merge ([ libraries['sigc2'],
libraries['boost'],
libraries['xml'],
libraries['glibmm2'],
libraries['glib2'] ])

View File

@ -40,7 +40,8 @@ cp.Merge ([
libraries['midi++2'],
libraries['xml'],
libraries['glib2'],
libraries['glibmm2']
libraries['glibmm2'],
libraries['boost']
])
libardour_cp = cp.SharedLibrary('ardour_cp', cp_files)

View File

@ -63,7 +63,8 @@ mackie.Merge ([
libraries['xml'],
libraries['glib2'],
libraries['glibmm2'],
libraries['sndfile']
libraries['sndfile'],
libraries['boost']
])
libardour_mackie = mackie.SharedLibrary('ardour_mackie', mackie_files)