From 850439fb049d06b59c0d78089ed7f821d8414935 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 17 Jan 2011 09:22:47 +0100
Subject: [PATCH] * Should fix win32 compile issues.

---
 src/CMakeLists.win32.txt       | 11 +----------
 src/libtomahawk/CMakeLists.txt | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/CMakeLists.win32.txt b/src/CMakeLists.win32.txt
index 7ac8be8b0..33713f511 100644
--- a/src/CMakeLists.win32.txt
+++ b/src/CMakeLists.win32.txt
@@ -39,17 +39,8 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
     "${CMAKE_CURRENT_SOURCE_DIR}/../build/src/libtomahawk/libtomahawklib.dll"
 )
 
-SET( tomahawkSourcesGui ${tomahawkSourcesGui} audio/rtaudiooutput.cpp )
-SET( tomahawkHeadersGui ${tomahawkHeadersGui} audio/rtaudiooutput.h )
-
 SET( OS_SPECIFIC_LINK_LIBRARIES 
     ${OS_SPECIFIC_LINK_LIBRARIES} 
-    "dsound.dll" 
-    "winmm.dll"
     "iphlpapi.a"
-    "mad"
-    "vorbisfile"
-    "ogg"
-    "FLAC++"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
+
 )
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 866e54e5a..acc786929 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -220,19 +220,23 @@ include_directories( . ${CMAKE_CURRENT_BINARY_DIR} ..
     ../../alsa-playback
 )
 
-qt4_wrap_ui( libUI_H ${libUI} )
-qt4_wrap_cpp( libMoc ${libHeaders} )
-
-SET( libSources ${libSources} ${libUI_H} )
-
-add_library( tomahawklib SHARED ${libSources} ${libMoc} )
 
 IF( WIN32 )
+SET( libSources ${libSources} audio/rtaudiooutput.cpp )
+SET( libHeaders ${libHeaders} audio/rtaudiooutput.h )
+
 SET( OS_SPECIFIC_LINK_LIBRARIES
     ${OS_SPECIFIC_LINK_LIBRARIES}
     "iphlpapi.a"
     "ws2_32.dll"
     "dnsapi.dll"
+    "dsound.dll" 
+    "winmm.dll"
+    "mad"
+    "vorbisfile"
+    "ogg"
+    "FLAC++"
+    "${CMAKE_CURRENT_SOURCE_DIR}/../../rtaudio/librtaudio.dll"
 )
 ENDIF( WIN32 )
 
@@ -254,6 +258,13 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 ENDIF( UNIX AND NOT APPLE )
 
 
+qt4_wrap_ui( libUI_H ${libUI} )
+qt4_wrap_cpp( libMoc ${libHeaders} )
+
+SET( libSources ${libSources} ${libUI_H} )
+
+add_library( tomahawklib SHARED ${libSources} ${libMoc} )
+
 target_link_libraries( tomahawklib
     ${QT_LIBRARIES}
     ${OS_SPECIFIC_LINK_LIBRARIES}