mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-10 00:34:59 +01:00
merge 2.0-ongoing into 3.0 @ 3581 - 3710
git-svn-id: svn://localhost/ardour2/branches/3.0@3712 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
68e943265e
commit
c86210a9d5
51 changed files with 1230 additions and 713 deletions
|
|
@ -286,8 +286,11 @@ if env['VST']:
|
|||
extra_sources += vst_files
|
||||
gtkardour.Append (CCFLAGS="-DVST_SUPPORT", CPPPATH="#libs/fst")
|
||||
|
||||
lv2_files = [ 'lv2_plugin_ui.cc' ]
|
||||
|
||||
if env['LV2']:
|
||||
gtkardour.Append (CCFLAGS="-DHAVE_SLV2")
|
||||
extra_sources += lv2_files
|
||||
gtkardour.Append (CCFLAGS="-DHAVE_LV2")
|
||||
gtkardour.Merge ([libraries['slv2']])
|
||||
|
||||
|
||||
|
|
@ -432,7 +435,7 @@ else:
|
|||
keybindings_dict['%LEVEL4%'] = env['WINDOWS_KEY']
|
||||
keybindings_dict['%WINDOW%'] = 'Alt'
|
||||
|
||||
for b in [ 'SAE-de', 'mnemonic-us', 'ergonomic-us' ]:
|
||||
for b in [ 'SAE-de', 'SAE-us', 'mnemonic-us', 'ergonomic-us' ]:
|
||||
target_file = b + '.bindings'
|
||||
src_file = target_file + '.in'
|
||||
Default (env.SubstInFile (target_file, src_file, SUBST_DICT = keybindings_dict))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue