Merge pull request #638 from tresf/stable-1.0

STK Mallet support (Apple)

data/scripts/create_apple_installer.sh

@@ -22,6 +22,8 @@ CMAKE_INSTALL=$CMAKE_SRC/target
 # LMMS source build directory
 CMAKE_BUILD=$CMAKE_SRC/build
 
+# STK rawwaves directory
+STK_RAWWAVE=$HOME/stk-*/rawwaves
 
 
 # Place to create ".app" bundle
@@ -56,6 +58,10 @@ cd $CMAKE_INSTALL
 mkdir $APP/Contents
 cp -R * $APP/Contents
 
+# Manually copy STK rawwaves
+mkdir -p $APP/Contents/share/stk/rawwaves
+cp $STK_RAWWAVE/*.raw $APP/Contents/share/stk/rawwaves
+
 # Make all libraries writable for macdeployqt
 cd $APP
 find . -type f -print0 | xargs -0 chmod u+w

src/core/config_mgr.cpp

@@ -355,8 +355,10 @@ void configManager::loadConfigFile()
 	if( m_stkDir.isEmpty() || m_stkDir == QDir::separator() ||
 			!QDir( m_stkDir ).exists() )
 	{
-#ifdef LMMS_BUILD_WIN32
+#if defined(LMMS_BUILD_WIN32)
 		m_stkDir = m_dataDir + "stk/rawwaves/";
+#elif defined(LMMS_BUILD_APPLE)
+		m_stkDir = qApp->applicationDirPath() + "/../share/stk/rawwaves/";
 #else
 		m_stkDir = "/usr/share/stk/rawwaves/";
 #endif