Skip to content
Permalink
Browse files

Merge pull request #3839 from lasconic/fix-208006-mac

fix #208006: Embed MP3 support by default on macOS
  • Loading branch information...
lasconic committed Jul 30, 2018
2 parents 31e8374 + b5e3f76 commit 45924076871483cb96b859cc374c5fbdbf76ba53
Showing with 7 additions and 4 deletions.
  1. +6 −0 build/travis/job_macos/script.sh
  2. +1 −4 mscore/exportmp3.cpp
@@ -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
@@ -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()

0 comments on commit 4592407

Please sign in to comment.
You can’t perform that action at this time.