mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-04 20:55:48 +01:00
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
e4372df05b
commit
68e943265e
283 changed files with 8269 additions and 3942 deletions
|
|
@ -6,8 +6,8 @@ import glob
|
|||
|
||||
Import('env install_prefix final_prefix config_prefix libraries i18n ardour_version')
|
||||
|
||||
gtkardour = env.Copy()
|
||||
gtkmmtests = env.Copy()
|
||||
gtkardour = env.Clone()
|
||||
gtkmmtests = env.Clone()
|
||||
|
||||
#
|
||||
# this defines the version number of the GTK interface to ardour
|
||||
|
|
@ -409,7 +409,7 @@ my_subst_dict = { }
|
|||
|
||||
keybindings_dict = { }
|
||||
|
||||
if gtkardour['GTKOSX'] and gtkardour['NATIVE_OSX_KEYS']:
|
||||
if gtkardour['GTKOSX']:
|
||||
#
|
||||
# Command(Meta), Alt(Mod1), Ctrl, Shift
|
||||
# **** as of february 4th 2008, OUR VERSION OF *****
|
||||
|
|
@ -487,6 +487,7 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'
|
|||
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files))
|
||||
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'icons'), icon_files))
|
||||
env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
|
||||
env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
|
||||
|
||||
# This will install icons and MIME type as per freedesktop.org specs. #
|
||||
if env['FREEDESKTOP']:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue