* Fix / cleanup CMakeLists.

src/CMakeLists.txt

@@ -324,17 +324,11 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
 TARGET_LINK_LIBRARIES( tomahawk
     ${QT_LIBRARIES}
     ${MAC_EXTRA_LIBS}
-    portfwd
     ${OS_SPECIFIC_LINK_LIBRARIES}
-    lastfm
+    portfwd
+    echonest
     qjson
     tag
-    mad
-    vorbis
-    vorbisenc
-    vorbisfile
-    gloox
-    echonest
 )
 
 INCLUDE( "CPack.txt" )

src/CMakeLists.unix.txt

@@ -10,8 +10,6 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
         ${LIBLASTFM_LIBRARY}
         ${GLOOX_LIBS}
         qxtweb-standalone
-        qjson
-        tag
 )
 
 IF( "${gui}" STREQUAL "no" )

src/CMakeLists.win32.txt

@@ -17,6 +17,11 @@ INCLUDE_DIRECTORIES(
 	../../taglib-1.6.3/taglib/toolkit
 )
 
+SET( OS_SPECIFIC_LINK_LIBRARIES 
+        ${LIBLASTFM_LIBRARY}
+        gloox
+)
+
 SET( OS_SPECIFIC_LINK_LIBRARIES 
 	"secur32.dll"
 	"crypt32.dll"
@@ -25,11 +30,6 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 	"${CMAKE_CURRENT_SOURCE_DIR}/../qxtweb-standalone/libqxtweb-standalone.dll"
 )
 
-SET( OS_SPECIFIC_LINK_LIBRARIES 
-	${OS_SPECIFIC_LINK_LIBRARIES} 
-	#"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
-	)
-
 IF( "${gui}" STREQUAL "no" )
 ELSE()
     SET( tomahawkSourcesGui ${tomahawkSourcesGui}
@@ -37,12 +37,15 @@ ELSE()
     )
     SET( tomahawkHeadersGui ${tomahawkHeadersGui} audio/rtaudiooutput.h )
 	
-	SET( OS_SPECIFIC_LINK_LIBRARIES 
-		 ${OS_SPECIFIC_LINK_LIBRARIES} 
-		 "dsound.dll" 
-		 "winmm.dll"
-                 "iphlpapi.a"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
-	)
+    SET( OS_SPECIFIC_LINK_LIBRARIES 
+	 ${OS_SPECIFIC_LINK_LIBRARIES} 
+	 "dsound.dll" 
+	 "winmm.dll"
+         "iphlpapi.a"
+         "mad"
+	 "vorbisfile"
+	 "ogg"
+	 "${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
+    )
 ENDIF()