diff --git a/build/travis/job_macos/script.sh b/build/travis/job_macos/script.sh index 4f8954606a1f6..de0256dd8b6f5 100755 --- a/build/travis/job_macos/script.sh +++ b/build/travis/job_macos/script.sh @@ -24,6 +24,12 @@ python build/add-mc-keys.py $MC_CONSUMER_KEY $MC_CONSUMER_SECRET fi make -f Makefile.osx ci + +# install lame +wget -c --no-check-certificate -nv -O musescore_dependencies_macos.zip http://utils.musescore.org.s3.amazonaws.com/musescore_dependencies_macos.zip +mkdir -p applebuild/mscore.app/Contents/Resources/Frameworks +unzip musescore_dependencies_macos.zip -d applebuild/mscore.app/Contents/Resources/Frameworks + if [ "$(grep '^[[:blank:]]*set( *MSCORE_UNSTABLE \+TRUE *)' CMakeLists.txt)" ] then # Build is marked UNSTABLE inside CMakeLists.txt build/package_mac $BRANCH-$REVISION diff --git a/mscore/exportmp3.cpp b/mscore/exportmp3.cpp index ea66db5542181..2b39556dd98ef 100644 --- a/mscore/exportmp3.cpp +++ b/mscore/exportmp3.cpp @@ -194,9 +194,6 @@ bool MP3Exporter::initLibrary(QString libpath) return false; } - /*qDebug("Actual LAME path %s", - FileNames::PathFromAddr(lame_lib->resolve("lame_init")));*/ - lame_init = (lame_init_t *) lame_lib->resolve("lame_init"); get_lame_version = (get_lame_version_t *) @@ -576,7 +573,7 @@ QString MP3Exporter::getLibraryTypeString() QString MP3Exporter::getLibraryPath() { - return QString("/usr/local/lib/audacity"); + return QString("%1/../Resources/Frameworks/").arg(qApp->applicationDirPath()); } QString MP3Exporter::getLibraryName()