From c5a29e42c1a81dc207128504a0ee0155acdb4688 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Mon, 14 Feb 2011 21:27:09 +0100
Subject: [PATCH] Clean up win32 link targets.

---
 src/CMakeLists.win32.txt        | 45 ++++++++++-----------------------
 src/libtomahawk/CMakeLists.txt  |  2 +-
 src/sip/jabber/CMakeLists.txt   |  2 +-
 src/sip/zeroconf/CMakeLists.txt |  2 +-
 4 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/src/CMakeLists.win32.txt b/src/CMakeLists.win32.txt
index 33713f511..9ecb59cfd 100644
--- a/src/CMakeLists.win32.txt
+++ b/src/CMakeLists.win32.txt
@@ -4,43 +4,26 @@ ADD_DEFINITIONS( /DNOMINMAX )
 ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
 ADD_DEFINITIONS( -static-libgcc )
 
-#ADD_DEFINITIONS( /DNO_LIBLASTFM )
-#ADD_DEFINITIONS( -DNO_OGG )
 
-# Add manual locations to stuff:
-INCLUDE_DIRECTORIES(
-    ../../libmad-0.15.1b
-    ../../boost_1_43_0
-    ../../gloox-1.0
-    ../../qjson
-    ../../liblastfm/_include
-    ../../taglib-1.6.3/
-    ../../taglib-1.6.3/build
-    ../../taglib-1.6.3/taglib
-    ../../taglib-1.6.3/taglib/toolkit
-)
+SET( OS_SPECIFIC_LINK_LIBRARIES
+    ${OS_SPECIFIC_LINK_LIBRARIES}
 
-
-SET( GLOOX_LIBS
-    ${GLOOX_LIBS}
-    gloox
-)
-
-SET( OS_SPECIFIC_LINK_LIBRARIES 
+# normal deps
     ${LIBLASTFM_LIBRARY}
     ${GLOOX_LIBS}
-)
 
-SET( OS_SPECIFIC_LINK_LIBRARIES 
-    ${OS_SPECIFIC_LINK_LIBRARIES}
+# third party shipped with tomahawk
+    ${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
+    ${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll
+    ${CMAKE_SOURCE_DIR}/qxt/qxtweb-standalone/libqxtweb-standalone.dll
+
+# system libs
     "secur32.dll"
     "crypt32.dll"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../qxt/qxtweb-standalone/libqxtweb-standalone.dll"
-    "${CMAKE_CURRENT_SOURCE_DIR}/../build/src/libtomahawk/libtomahawklib.dll"
-)
-
-SET( OS_SPECIFIC_LINK_LIBRARIES 
-    ${OS_SPECIFIC_LINK_LIBRARIES} 
     "iphlpapi.a"
-
+    "ws2_32.dll"
+    "dnsapi.dll"
+    "dsound.dll"
+    "winmm.dll"
+    "advapi32.dll"
 )
diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index db4789cea..542044fb8 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -325,7 +325,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
     "winmm.dll"
     "advapi32.dll"
 
-    "${CMAKE_CURRENT_SOURCE_DIR}/../../rtaudio/librtaudio.dll"
+    ${CMAKE_SOURCE_DIR}/rtaudio/librtaudio.dll
 )
 ENDIF( WIN32 )
 
diff --git a/src/sip/jabber/CMakeLists.txt b/src/sip/jabber/CMakeLists.txt
index eeeb3962a..be9ccb02b 100644
--- a/src/sip/jabber/CMakeLists.txt
+++ b/src/sip/jabber/CMakeLists.txt
@@ -33,7 +33,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 	${OS_SPECIFIC_LINK_LIBRARIES}
 	"secur32.dll"
 	"crypt32.dll"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll"
+        ${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
 )
 ENDIF( WIN32 )
 
diff --git a/src/sip/zeroconf/CMakeLists.txt b/src/sip/zeroconf/CMakeLists.txt
index 3cb941bf7..53e2f7acc 100644
--- a/src/sip/zeroconf/CMakeLists.txt
+++ b/src/sip/zeroconf/CMakeLists.txt
@@ -27,7 +27,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 	${OS_SPECIFIC_LINK_LIBRARIES}
 	"winmm.dll"
         "iphlpapi.a"
-        "${CMAKE_CURRENT_SOURCE_DIR}/../../../build/src/libtomahawk/libtomahawklib.dll"
+        ${CMAKE_BINARY_DIR}/src/libtomahawk/libtomahawklib.dll
 )
 ENDIF( WIN32 )