diff options
-rw-r--r-- | gtk2_ardour/bundle_env_linux.cc | 6 | ||||
-rw-r--r-- | tools/linux_packaging/ardour.sh.in | 2 | ||||
-rwxr-xr-x | tools/linux_packaging/build | 18 |
3 files changed, 22 insertions, 4 deletions
diff --git a/gtk2_ardour/bundle_env_linux.cc b/gtk2_ardour/bundle_env_linux.cc index cc02445302..2586ad5dcd 100644 --- a/gtk2_ardour/bundle_env_linux.cc +++ b/gtk2_ardour/bundle_env_linux.cc @@ -59,6 +59,12 @@ fixup_bundle_environment (int /*argc*/, char* argv[], string & localedir) std::string path; std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0])); +#if defined WINDOWS_VST_SUPPORT + // argv[0] will be "wine" + if (g_getenv ("INSTALL_DIR")) { + dir_path = g_getenv ("INSTALL_DIR"); + } +#endif #ifdef ENABLE_NLS if (!ARDOUR::translations_are_enabled ()) { diff --git a/tools/linux_packaging/ardour.sh.in b/tools/linux_packaging/ardour.sh.in index 420bdf581d..07ec07eca5 100644 --- a/tools/linux_packaging/ardour.sh.in +++ b/tools/linux_packaging/ardour.sh.in @@ -47,5 +47,5 @@ if [ "T" = "$DEBUG" ]; then export ARDOUR_INSIDE_GDB=1 exec gdb $INSTALL_DIR/bin/%EXENAME%-%VER% else - exec $INSTALL_DIR/bin/%EXENAME%-%VER% "$@" + exec %WINE% $INSTALL_DIR/bin/%EXENAME%-%VER% "$@" fi diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index ff78849b0c..1a12995a08 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -237,12 +237,24 @@ fi echo export 'PATH=/usr/local/bin:/opt/bin:$PATH' >> $ENVIRONMENT # create startup helper script +if test -d $BUILD_ROOT/vst; then + WINEEXE=wine + echo export INSTALL_DIR >> $ENVIRONMENT +else + WINEEXE= +fi -sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/;s/%EXENAME%/'"${EXENAME}"'/' < ardour.sh.in > $APPBIN/${EXENAME}${major_version} +sed -e "/^%ENV%/r $ENVIRONMENT" -e '/^%ENV%/d' -e 's/%VER%/'"${release_version}"'/;s/%EXENAME%/'"${EXENAME}"'/;s/%WINE%/'"$WINEEXE"'/' < ardour.sh.in > $APPBIN/${EXENAME}${major_version} rm $ENVIRONMENT && chmod 775 $APPBIN/${EXENAME}${major_version} echo "Copying ardour executable ...." -cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version} $APPBIN/${EXENAME}-${release_version} +if test -d $BUILD_ROOT/vst; then + #cp -v $BUILD_ROOT/gtk2_ardour/libgtk2_ardour.so $APPLIB/ + cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version}-vst.exe.so $APPBIN/${EXENAME}-${release_version} +else + cp -v $BUILD_ROOT/gtk2_ardour/ardour-${release_version}* $APPBIN/${EXENAME}-${release_version} +fi + if test x$STRIP = xall ; then strip -s $APPBIN/${EXENAME}-${release_version} fi @@ -426,7 +438,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:$OURLIBDIR/ptformat +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:$BUILD_ROOT/gtk2_ardour echo $OURLIBS${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} |