Skip to content

Commit

Permalink
Enable building with Lame on OS X
Browse files Browse the repository at this point in the history
Adjust the Travis script to install lame and remove the lines from the
CMakeLists.txt that disabled MP3 export for the OS X build.
  • Loading branch information
michaelgregorius committed Jun 6, 2017
1 parent ed011e7 commit 969ade2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion .travis/osx..install.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

PACKAGES="cmake pkgconfig fftw libogg libvorbis libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"
PACKAGES="cmake pkgconfig fftw libogg libvorbis lame libsndfile libsamplerate jack sdl libgig libsoundio stk portaudio node fltk"

if [ $QT5 ]; then
PACKAGES="$PACKAGES homebrew/versions/qt55"
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,9 @@ OPTION(WANT_QT5 "Build with Qt5" OFF)

IF(LMMS_BUILD_APPLE)
SET(WANT_ALSA OFF)
SET(WANT_MP3LAME OFF)
SET(WANT_PULSEAUDIO OFF)
SET(WANT_VST OFF)
SET(STATUS_ALSA "<not supported on this platform>")
SET(STATUS_MP3LAME "<not supported on this platform>")
SET(STATUS_PULSEAUDIO "<not supported on this platform>")
SET(STATUS_APPLEMIDI "OK")
ELSE(LMMS_BUILD_APPLE)
Expand Down

1 comment on commit 969ade2

@tresf
Copy link
Member

@tresf tresf commented on 969ade2 Jun 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Please sign in to comment.