mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-20 05:36:31 +01:00
minor fixes from OS X land
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2720 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
parent
618f575ac1
commit
598e0dd010
5 changed files with 66 additions and 41 deletions
59
SConstruct
59
SConstruct
|
|
@ -403,6 +403,29 @@ else:
|
|||
os.remove('.personal_use_only')
|
||||
|
||||
|
||||
####################
|
||||
# push environment
|
||||
####################
|
||||
|
||||
def pushEnvironment(context):
|
||||
if os.environ.has_key('PATH'):
|
||||
context.Append(PATH = os.environ['PATH'])
|
||||
|
||||
if os.environ.has_key('PKG_CONFIG_PATH'):
|
||||
context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH'])
|
||||
|
||||
if os.environ.has_key('CC'):
|
||||
context['CC'] = os.environ['CC']
|
||||
|
||||
if os.environ.has_key('CXX'):
|
||||
context['CXX'] = os.environ['CXX']
|
||||
|
||||
if os.environ.has_key('DISTCC_HOSTS'):
|
||||
context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
|
||||
context['ENV']['HOME'] = os.environ['HOME']
|
||||
|
||||
pushEnvironment (env)
|
||||
|
||||
#######################
|
||||
# Dependency Checking #
|
||||
#######################
|
||||
|
|
@ -425,16 +448,16 @@ def DependenciesRequiredMessage():
|
|||
print 'Please consult http://ardour.org/building for more information'
|
||||
|
||||
def CheckPKGConfig(context, version):
|
||||
context.Message( 'Checking for pkg-config version >= %s... ' %version )
|
||||
ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
|
||||
context.Result( ret )
|
||||
return ret
|
||||
context.Message( 'Checking for pkg-config version >= %s... ' %version )
|
||||
ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0]
|
||||
context.Result( ret )
|
||||
return ret
|
||||
|
||||
def CheckPKGVersion(context, name, version):
|
||||
context.Message( 'Checking for %s... ' % name )
|
||||
ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0]
|
||||
context.Result( ret )
|
||||
return ret
|
||||
context.Message( 'Checking for %s... ' % name )
|
||||
ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0]
|
||||
context.Result( ret )
|
||||
return ret
|
||||
|
||||
def CheckPKGExists(context, name):
|
||||
context.Message ('Checking for %s...' % name)
|
||||
|
|
@ -751,7 +774,7 @@ libraries['vamp'] = LibraryInfo()
|
|||
|
||||
env['RUBBERBAND'] = False
|
||||
|
||||
conf = libraries['vamp'].Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
|
||||
conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
|
||||
|
||||
if conf.CheckPKGExists('vamp-sdk'):
|
||||
have_vamp = True
|
||||
|
|
@ -759,8 +782,6 @@ if conf.CheckPKGExists('vamp-sdk'):
|
|||
else:
|
||||
have_vamp = False
|
||||
|
||||
print "---> WE HAVE VAMP: ", have_vamp
|
||||
|
||||
libraries['vamp'] = conf.Finish ()
|
||||
|
||||
if have_vamp:
|
||||
|
|
@ -1091,22 +1112,6 @@ if env['RUBBERBAND']:
|
|||
opts.Save('scache.conf', env)
|
||||
Help(opts.GenerateHelpText(env))
|
||||
|
||||
if os.environ.has_key('PATH'):
|
||||
env.Append(PATH = os.environ['PATH'])
|
||||
|
||||
if os.environ.has_key('PKG_CONFIG_PATH'):
|
||||
env.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH'])
|
||||
|
||||
if os.environ.has_key('CC'):
|
||||
env['CC'] = os.environ['CC']
|
||||
|
||||
if os.environ.has_key('CXX'):
|
||||
env['CXX'] = os.environ['CXX']
|
||||
|
||||
if os.environ.has_key('DISTCC_HOSTS'):
|
||||
env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
|
||||
env['ENV']['HOME'] = os.environ['HOME']
|
||||
|
||||
final_prefix = '$PREFIX'
|
||||
|
||||
if env['DESTDIR'] :
|
||||
|
|
|
|||
|
|
@ -1478,18 +1478,20 @@ Editor::left_automation_track ()
|
|||
bool
|
||||
Editor::motion_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type, bool from_autoscroll)
|
||||
{
|
||||
gint x, y;
|
||||
if (event->motion.is_hint) {
|
||||
gint x, y;
|
||||
|
||||
/* We call this so that MOTION_NOTIFY events continue to be
|
||||
delivered to the canvas. We need to do this because we set
|
||||
Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces
|
||||
the density of the events, at the expense of a round-trip
|
||||
to the server. Given that this will mostly occur on cases
|
||||
where DISPLAY = :0.0, and given the cost of what the motion
|
||||
event might do, its a good tradeoff.
|
||||
*/
|
||||
/* We call this so that MOTION_NOTIFY events continue to be
|
||||
delivered to the canvas. We need to do this because we set
|
||||
Gdk::POINTER_MOTION_HINT_MASK on the canvas. This reduces
|
||||
the density of the events, at the expense of a round-trip
|
||||
to the server. Given that this will mostly occur on cases
|
||||
where DISPLAY = :0.0, and given the cost of what the motion
|
||||
event might do, its a good tradeoff.
|
||||
*/
|
||||
|
||||
track_canvas.get_pointer (x, y);
|
||||
track_canvas.get_pointer (x, y);
|
||||
}
|
||||
|
||||
if (current_stepping_trackview) {
|
||||
/* don't keep the persistent stepped trackview if the mouse moves */
|
||||
|
|
|
|||
|
|
@ -1474,7 +1474,7 @@ Playlist::find_next_region_boundary (nframes64_t frame, int dir)
|
|||
|
||||
if (dir > 0) {
|
||||
|
||||
for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
|
||||
for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
|
||||
|
||||
boost::shared_ptr<Region> r = (*i);
|
||||
nframes64_t distance;
|
||||
|
|
@ -1511,7 +1511,7 @@ Playlist::find_next_region_boundary (nframes64_t frame, int dir)
|
|||
|
||||
} else {
|
||||
|
||||
for (RegionList::const_reverse_iterator i = regions.rbegin(); i != regions.rend(); ++i) {
|
||||
for (RegionList::reverse_iterator i = regions.rbegin(); i != regions.rend(); ++i) {
|
||||
|
||||
boost::shared_ptr<Region> r = (*i);
|
||||
nframes64_t distance;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,9 @@ Import('env install_prefix libraries')
|
|||
rb = env.Copy()
|
||||
|
||||
rb.Merge ([libraries['fftw3f'],
|
||||
libraries['fftw3'],
|
||||
libraries['vamp'],
|
||||
libraries['samplerate'],
|
||||
libraries['sndfile-ardour']
|
||||
])
|
||||
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ SAE=
|
|||
WITH_JACK=1
|
||||
WITH_LADSPA=1
|
||||
STRIP=1
|
||||
PRINT_SYSDEPS=
|
||||
|
||||
while [ $# -gt 0 ] ; do
|
||||
echo "arg = $1"
|
||||
|
|
@ -16,6 +17,7 @@ while [ $# -gt 0 ] ; do
|
|||
--nojack) WITH_JACK= ; shift ;;
|
||||
--noladpsa) WITH_LADSPA= ; shift ;;
|
||||
--nostrip) STRIP= ; shift ;;
|
||||
--sysdeps) PRINT_SYSDEPS=1; shift ;;
|
||||
esac
|
||||
done
|
||||
|
||||
|
|
@ -31,6 +33,20 @@ Plugins=$APPROOT/Plugins
|
|||
Shared=$Resources/share
|
||||
Etc=$Resources/etc
|
||||
|
||||
if [ x$PRINT_SYSDEPS != x ] ; then
|
||||
#
|
||||
# print system dependencies
|
||||
#
|
||||
|
||||
for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Plugins/*.so ; do
|
||||
if ! file $file | grep -qs Mach-O ; then
|
||||
continue
|
||||
fi
|
||||
otool -L $file | awk '{print $1}' | egrep -v "(^@executable_path|^Ardour[0-9][.0-9]*.app)"
|
||||
done | sort | uniq
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "Removing old Ardour2.app tree ..."
|
||||
|
||||
rm -rf Ardour2.app
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue