summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-08-06 01:02:13 +0200
committerRobin Gareus <robin@gareus.org>2015-08-06 01:02:13 +0200
commitb75a38089be96109cec2943dbd10902df048bc8b (patch)
treeeefe88d2495561c43df4d1a90509007544f956ee
parentbd8662efe39837b9bc658937c874f0df4572ce59 (diff)
fix ptf library deplyoment
-rw-r--r--libs/ptformat/wscript2
-rwxr-xr-xtools/linux_packaging/build2
-rwxr-xr-xtools/x-win/package.sh1
3 files changed, 3 insertions, 2 deletions
diff --git a/libs/ptformat/wscript b/libs/ptformat/wscript
index 3b191d3c75..9e1e11fbf0 100644
--- a/libs/ptformat/wscript
+++ b/libs/ptformat/wscript
@@ -37,7 +37,7 @@ def build(bld):
obj.use = 'libardour'
autowaf.ensure_visible_symbols (obj, True)
obj.vnum = LIBPTFORMAT_LIB_VERSION
- obj.install_path = os.path.join(bld.env['LIBDIR'], 'ptformat')
+ obj.install_path = bld.env['LIBDIR']
def shutdown():
autowaf.shutdown()
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index cc6c30a904..0915beba3a 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -421,7 +421,7 @@ if test -f $BUILD_ROOT/libs/ardouralsautil/ardour-request-device; then
fi
OURLIBDIR=$BUILD_ROOT/libs
-OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/canvas:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil
+OURLIBS=$OURLIBDIR/vamp-sdk:$OURLIBDIR/surfaces/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/rubberband:$OURLIBDIR/soundtouch:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/sigc++2:$OURLIBDIR/glibmm2:$OURLIBDIR/gtkmm2/atk:$OURLIBDIR/gtkmm2/pango:$OURLIBDIR/gtkmm2/gdk:$OURLIBDIR/gtkmm2/gtk:$OURLIBDIR/canvas:$OURLIBDIR/libsndfile:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/timecode:$OURLIBDIR/taglib:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat
echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index 9880727906..0c75cd29e5 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -123,6 +123,7 @@ cp build/libs/timecode/timecode.dll $DESTDIR/bin/
cp build/libs/qm-dsp/qmdsp-*.dll $DESTDIR/bin/
cp build/libs/canvas/canvas-*.dll $DESTDIR/bin/
cp build/libs/pbd/pbd-*.dll $DESTDIR/bin/
+cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/
cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/
cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true
cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE}