diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 21:57:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 21:57:17 -0400 |
| commit | fb313fb1741a04f270fff3703967df572ac4fc45 (patch) | |
| tree | 5f5477510365ca0972a2467f660da0507abced3e /tools | |
| parent | 8ea695c00ab0bdbc6fbb29b33fac6e3dbfcbe9f1 (diff) | |
| parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/linux_packaging/build | 1 | ||||
| -rwxr-xr-x | tools/osx_packaging/osx_build | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 3d8b58c97c..3bf793a637 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -531,6 +531,7 @@ fi # share stuff cp -R ../../gtk2_ardour/splash.png $Shared +cp -R ../../gtk2_ardour/small-splash.png $Shared cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared # go through and recursively remove any .svn dirs in the bundle diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 8cce6423d6..276eb90fe5 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -351,7 +351,7 @@ cp $ARDOURSTACK_ROOT/lib/suil-0/lib* $Frameworks while [ true ] ; do missing=false - for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Surfaces/*.dylib $Plugins/*.so ; do + for file in $APPROOT/MacOS/* $Frameworks/* $Frameworks/modules/* $Panners/*.dylib $Backends/*.dylib $Surfaces/*.dylib $Plugins/*.so ; do if ! file $file | grep -qs Mach-O ; then continue fi @@ -409,6 +409,7 @@ cp -r ../../gtk2_ardour/pixmaps $Resources # shared stuff cp -R ../../gtk2_ardour/splash.png $Shared +cp -R ../../gtk2_ardour/small-splash.png $Shared cp -R ../../gtk2_ardour/ArdourMono.ttf $Shared # go through and recursively remove any .svn dirs in the bundle @@ -437,7 +438,7 @@ done echo "Fixing up library names ..." # now do the same for all the libraries we include -for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners ; do +for libdir in $Frameworks $Frameworks/modules $Surfaces $Panners $Backends ; do libbase=`basename $libdir` |