Merge pull request #638 from tresf/stable-1.0

STK Mallet support (Apple)
2014-04-24 09:11:45 +02:00
parent 5168c50325 53e67bae00
commit cf35a58629
2 changed files with 9 additions and 1 deletions
--- a/src/core/config_mgr.cpp
+++ b/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