From 8b40de713737ccf0d671f9d233d1687969abf0b4 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Wed, 17 Dec 2008 23:25:54 +0000
Subject: [PATCH] added STK support to win32 version of LMMS

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1953 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 CMakeLists.txt              |  4 +---
 ChangeLog                   | 10 ++++++++++
 cmake/modules/FindSTK.cmake |  4 ++--
 data/CMakeLists.txt         |  5 +++++
 include/combobox.h          |  2 +-
 include/combobox_model.h    |  2 +-
 src/core/config_mgr.cpp     |  6 +++++-
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 092159dc1..c6e1ac227 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,14 +69,12 @@ IF(LMMS_BUILD_WIN32)
 	SET(WANT_ALSA OFF)
 	SET(WANT_JACK OFF)
 	SET(WANT_PULSEAUDIO OFF)
-	SET(WANT_STK OFF)
 	SET(WANT_SYSTEM_SR OFF)
 	SET(WANT_WINMM ON)
 	SET(LMMS_HAVE_WINMM TRUE)
 	SET(STATUS_ALSA "<not supported on this platform>")
 	SET(STATUS_JACK "<not supported on this platform>")
 	SET(STATUS_PULSEAUDIO "<not supported on this platform>")
-	SET(STATUS_STK "<not supported on this platform>")
 	SET(STATUS_WINMM "OK")
 ELSE(LMMS_BUILD_WIN32)
 	SET(STATUS_WINMM "<not supported on this platform>")
@@ -676,7 +674,7 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
 IF(VERSION_SUFFIX)
 	SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}-${VERSION_SUFFIX}")
 ENDIF(VERSION_SUFFIX)
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS-${VERSION}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "LMMS ${VERSION}")
 IF(WIN32)
 SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data\\\\nsis_branding.bmp")
 SET(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/data\\\\lmms.ico")
diff --git a/ChangeLog b/ChangeLog
index 714252a3a..0317a3cf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-17	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* cmake/modules/FindSTK.cmake:
+	* include/combobox_model.h:
+	* include/combobox.h:
+	* src/core/config_mgr.cpp:
+	* data/CMakeLists.txt:
+	* CMakeLists.txt:
+	added STK support to win32 version of LMMS
+
 2008-12-16	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* plugins/sf2_player/sf2_player.cpp:
diff --git a/cmake/modules/FindSTK.cmake b/cmake/modules/FindSTK.cmake
index 4647ab89d..d5fb0c0e7 100644
--- a/cmake/modules/FindSTK.cmake
+++ b/cmake/modules/FindSTK.cmake
@@ -1,6 +1,6 @@
-FIND_PATH(STK_INCLUDE_DIR Stk.h /usr/include/stk /usr/local/include/stk)
+FIND_PATH(STK_INCLUDE_DIR Stk.h /usr/include/stk /usr/local/include/stk ${CMAKE_INSTALL_PREFIX}/include/stk)
 
-FIND_LIBRARY(STK_LIBRARY NAMES stk PATH /usr/lib /usr/local/lib) 
+FIND_LIBRARY(STK_LIBRARY NAMES stk PATH /usr/lib /usr/local/lib ${CMAKE_INSTALL_PREFIX}/lib) 
 
 IF (STK_INCLUDE_DIR AND STK_LIBRARY)
    SET(STK_FOUND TRUE)
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 96f99e313..2583c59cf 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -11,3 +11,8 @@ INSTALL(FILES lmms.desktop DESTINATION ${DATA_DIR}/applications)
 INSTALL(FILES lmms.xml DESTINATION ${DATA_DIR}/mime/packages)
 ENDIF(LMMS_BUILD_LINUX)
 
+IF(LMMS_BUILD_WIN32)
+FILE(GLOB RAWWAVES ${CMAKE_INSTALL_PREFIX}/share/stk/rawwaves/*.raw)
+INSTALL(FILES ${RAWWAVES} DESTINATION ${DATA_DIR}/stk/rawwaves)
+ENDIF(LMMS_BUILD_WIN32)
+
diff --git a/include/combobox.h b/include/combobox.h
index 85ba3e49f..ec61b9fdc 100644
--- a/include/combobox.h
+++ b/include/combobox.h
@@ -34,7 +34,7 @@
 
 
 
-class comboBox : public QWidget, public intModelView
+class EXPORT comboBox : public QWidget, public intModelView
 {
 	Q_OBJECT
 public:
diff --git a/include/combobox_model.h b/include/combobox_model.h
index 3b644de97..b9b7c0ff5 100644
--- a/include/combobox_model.h
+++ b/include/combobox_model.h
@@ -35,7 +35,7 @@
 class pixmapLoader;
 
 
-class comboBoxModel : public intModel
+class EXPORT comboBoxModel : public intModel
 {
 	Q_OBJECT
 public:
diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp
index 9d5af1e7f..dfb58dd5f 100644
--- a/src/core/config_mgr.cpp
+++ b/src/core/config_mgr.cpp
@@ -314,9 +314,13 @@ void configManager::loadConfigFile( void )
 	}
 
 #ifdef LMMS_HAVE_STK
-	if( m_stkDir == "" )
+	if( m_stkDir == "" || m_stkDir == QDir::separator() )
 	{
+#ifdef LMMS_BUILD_WIN32
+		m_stkDir = m_dataDir + "stk/rawwaves/";
+#else
 		m_stkDir = "/usr/share/stk/rawwaves/";
+#endif
 	}
 #endif