projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RAII to postpone processor changes/graph recalculation
[ardour.git]
/
wscript
diff --git
a/wscript
b/wscript
index 82505dc74d612049fa41342bfab1ea0f31763559..dbc73417b20a51e6ba7fcf61ffb25cba3d974873 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-144,7
+144,7
@@
compiler_flags_dictionaries['clang'] = clang_dict;
clang_darwin_dict = compiler_flags_dictionaries['clang'].copy();
clang_darwin_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', ]
clang_darwin_dict = compiler_flags_dictionaries['clang'].copy();
clang_darwin_dict['cxx-strict'] = [ '-ansi', '-Wnon-virtual-dtor', '-Woverloaded-virtual', ]
-clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math'
, '-fstrength-reduce'
]
+clang_darwin_dict['full-optimization'] = [ '-O3', '-ffast-math']
compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict;
def fetch_git_revision ():
compiler_flags_dictionaries['clang-darwin'] = clang_darwin_dict;
def fetch_git_revision ():
@@
-201,12
+201,13
@@
out = 'build'
children = [
# optionally external libraries
children = [
# optionally external libraries
- 'libs/qm-dsp',
- 'libs/vamp-plugins',
- 'libs/libltc',
'libs/fluidsynth',
'libs/fluidsynth',
+ 'libs/hidapi',
+ 'libs/libltc',
'libs/lua',
'libs/ptformat',
'libs/lua',
'libs/ptformat',
+ 'libs/qm-dsp',
+ 'libs/vamp-plugins',
# core ardour libraries
'libs/pbd',
'libs/midi++2',
# core ardour libraries
'libs/pbd',
'libs/midi++2',
@@
-773,6
+774,10
@@
def options(opt):
help='Turn on PT session import option')
opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews',
help='Disable threaded waveview rendering')
help='Turn on PT session import option')
opt.add_option('--no-threaded-waveviews', action='store_true', default=False, dest='no_threaded_waveviews',
help='Disable threaded waveview rendering')
+ opt.add_option(
+ '--qm-dsp-include', type='string', action='store',
+ dest='qm_dsp_include', default='/usr/include/qm-dsp',
+ help='directory where the header files of qm-dsp can be found')
for i in children:
opt.recurse(i)
for i in children:
opt.recurse(i)
@@
-876,6
+881,9
@@
def configure(conf):
conf.define ('HAVE_COREAUDIO', 1)
conf.define ('AUDIOUNIT_SUPPORT', 1)
conf.define ('HAVE_COREAUDIO', 1)
conf.define ('AUDIOUNIT_SUPPORT', 1)
+ if not Options.options.ppc:
+ conf.define('MACVST_SUPPORT', 1)
+
conf.define ('TOP_MENUBAR',1)
# It would be nice to be able to use this to force back-compatibility with 10.4
conf.define ('TOP_MENUBAR',1)
# It would be nice to be able to use this to force back-compatibility with 10.4
@@
-933,6
+941,8
@@
def configure(conf):
if Options.options.use_external_libs:
conf.define('USE_EXTERNAL_LIBS', 1)
if Options.options.use_external_libs:
conf.define('USE_EXTERNAL_LIBS', 1)
+ conf.env.append_value(
+ 'CXXFLAGS', '-I' + Options.options.qm_dsp_include)
if Options.options.boost_include != '':
conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
if Options.options.boost_include != '':
conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
@@
-1222,6
+1232,7
@@
const char* const ardour_config_info = "\\n\\
write_config_text('Unit tests', conf.env['BUILD_TESTS'])
write_config_text('Mac i386 Architecture', opts.generic)
write_config_text('Mac ppc Architecture', opts.ppc)
write_config_text('Unit tests', conf.env['BUILD_TESTS'])
write_config_text('Mac i386 Architecture', opts.generic)
write_config_text('Mac ppc Architecture', opts.ppc)
+ write_config_text('Mac VST support', conf.is_defined('MACVST_SUPPORT'))
write_config_text('Windows VST support', opts.windows_vst)
write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))
write_config_text('Windows key', opts.windows_key)
write_config_text('Windows VST support', opts.windows_vst)
write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))
write_config_text('Windows key', opts.windows_key)