mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-20 12:26:07 +01:00
merged from master, another royal mess that git really didn't do a very good job of handling
This commit is contained in:
parent
55c59504ca
commit
cfafa7bf83
81 changed files with 8778 additions and 229 deletions
|
|
@ -11,11 +11,7 @@ fi
|
|||
|
||||
cd $BASE || exit 1
|
||||
svn update || exit 1
|
||||
<<<<<<< HEAD
|
||||
./waf configure --strict --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1
|
||||
=======
|
||||
./waf configure $* --strict --noconfirm --also-libdir=$HOME/a3/inst/lib --also-include=$HOME/gtk/inst/include || exit 1
|
||||
>>>>>>> master
|
||||
./waf || exit 1
|
||||
cd tools/linux_packaging || exit 1
|
||||
./build --public --strip some || exit 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue