ardour/livetrax
13
0
Fork 0
Code

provide a way to add additional libraries so that we can find libs that (stupidly) do not use pkg-config and are not installed in "standard" locations

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@12170 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-05-04 02:43:22 +00:00
parent c49fcda656
commit ffcbc9ab9e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wscript
View File

@ -413,7 +413,9 @@ def options(opt):
opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='', opt.add_option('--boost-include', type='string', action='store', dest='boost_include', default='',
help='directory where Boost header files can be found') help='directory where Boost header files can be found')
opt.add_option('--also-include', type='string', action='store', dest='also_include', default='', opt.add_option('--also-include', type='string', action='store', dest='also_include', default='',
help='additional include directory where header files can be found') help='additional include directory where header files can be found (split multiples with commas)')
opt.add_option('--also-libdir', type='string', action='store', dest='also_libdir', default='',
help='additional include directory where shared libraries can be found (split multiples with commas)')
opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows', opt.add_option('--wine-include', type='string', action='store', dest='wine_include', default='/usr/include/wine/windows',
help='directory where Wine\'s Windows header files can be found') help='directory where Wine\'s Windows header files can be found')
opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm', opt.add_option('--noconfirm', action='store_true', default=False, dest='noconfirm',
@ -531,6 +533,9 @@ def configure(conf):
conf.env.append_value('CXXFLAGS', '-I' + Options.options.also_include) conf.env.append_value('CXXFLAGS', '-I' + Options.options.also_include)
conf.env.append_value('CFLAGS', '-I' + Options.options.also_include) conf.env.append_value('CFLAGS', '-I' + Options.options.also_include)
if Options.options.also_libdir != '':
conf.env.append_value('LDFLAGS', '-L' + Options.options.also_libdir)
autowaf.check_header(conf, 'cxx', 'boost/signals2.hpp', mandatory = True) autowaf.check_header(conf, 'cxx', 'boost/signals2.hpp', mandatory = True)
if Options.options.boost_sp_debug: if Options.options.boost_sp_debug: