From 40f640951ce907803321dfbd23f97443f3e8e627 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 8 Sep 2014 11:13:50 -0400 Subject: [PATCH 1/2] Disable "Show GUI" button on Apple to prevent crash --- plugins/zynaddsubfx/ZynAddSubFx.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/zynaddsubfx/ZynAddSubFx.cpp b/plugins/zynaddsubfx/ZynAddSubFx.cpp index 40c2737c7..05e9946b8 100644 --- a/plugins/zynaddsubfx/ZynAddSubFx.cpp +++ b/plugins/zynaddsubfx/ZynAddSubFx.cpp @@ -533,6 +533,9 @@ ZynAddSubFxView::ZynAddSubFxView( Instrument * _instrument, QWidget * _parent ) m_toggleUIButton = new QPushButton( tr( "Show GUI" ), this ); m_toggleUIButton->setCheckable( true ); +#ifdef LMMS_BUILD_APPLE + m_toggleUIButton->setEnabled( false ); +#endif m_toggleUIButton->setChecked( false ); m_toggleUIButton->setIcon( embed::getIconPixmap( "zoom" ) ); m_toggleUIButton->setFont( pointSize<8>( m_toggleUIButton->font() ) ); From 74e53f835419f5b3b2dfba6a696d0d63898a08b1 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 8 Sep 2014 12:35:57 -0400 Subject: [PATCH 2/2] Set "WANT_SF2" to "OFF" for Apple --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb4bfe7c3..9726c7cda 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,8 @@ OPTION(WANT_WINMM "Include WinMM MIDI support" OFF) IF(LMMS_BUILD_APPLE) - SET(WANT_ALSA OFF) + SET(WANT_SF2 OFF) + SET(WANT_ALSA OFF) SET(WANT_PULSEAUDIO OFF) SET(WANT_VST OFF) SET(STATUS_ALSA "")