From 0b80cd65bd4e28c90937b4792dbcb4370739ec77 Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Tue, 24 May 2011 05:59:15 +0200
Subject: [PATCH] Update and simplify tomahawk.nsi

---
 CMakeLists.txt             |  3 +++
 admin/win/nsi/tomahawk.nsi | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10d4b35b7..4b63885ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,9 @@ SET( TOMAHAWK_VERSION "0.1.0" )
 # set paths
 SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" )
 SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
 
 # Check if we need qtgui:
 IF( "${gui}" STREQUAL "no" )
diff --git a/admin/win/nsi/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi
index 43c4791a4..bd3a83cab 100644
--- a/admin/win/nsi/tomahawk.nsi
+++ b/admin/win/nsi/tomahawk.nsi
@@ -33,9 +33,11 @@
 !delfile revision.txt
 !appendfile revision.txt ${REVISION}
 
-!define VER_MAJOR "0"
-!define VER_MINOR "0"
-!define VER_BUILD "3"
+!ifndef VER_MAJOR && VER_MINOR && VER_BUILD
+    !define VER_MAJOR "0"
+    !define VER_MINOR "1"
+    !define VER_BUILD "0"
+!endif
 
 !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"
 
@@ -273,7 +275,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
 
         File "${INSTALL_PATH}\lib\libqxtweb-standalone.dll"
         File "${INSTALL_PATH}\lib\libtomahawk_jdns.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_qtweetlib.dll"
         File "${INSTALL_PATH}\lib\libtomahawk_lastfm2.dll"
         File "${INSTALL_PATH}\lib\libtomahawklib.dll"
         File "${INSTALL_PATH}\lib\libtomahawk_sipjabber.dll"
@@ -283,11 +284,12 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    !ifndef INSTALL_PATH
         ;Main executable.
         File "${BUILD_PATH}\tomahawk.exe"
-        File "${BUILD_PATH}\thirdparty\qxt\qxtweb-standalone\libqxtweb-standalone.dll"
-        File "${BUILD_PATH}\thirdparty\jdns\libtomahawk_jdns.dll"
-        File "${BUILD_PATH}\thirdparty\qtweetlib\libtomahawk_qtweetlib.dll"
-        File "${BUILD_PATH}\thirdparty\liblastfm2\src\libtomahawk_lastfm2.dll"
-        File "${BUILD_PATH}\src\libtomahawk\libtomahawklib.dll"
+
+        File "${BUILD_PATH}\libtomahawklib.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
+        File "${BUILD_PATH}\libtomahawk_jdns.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
+        File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
         File "${BUILD_PATH}\libtomahawk_sipjabber.dll"
         File "${BUILD_PATH}\libtomahawk_siptwitter.dll"
         File "${BUILD_PATH}\libtomahawk_sipzeroconf.dll"
@@ -340,6 +342,9 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
 
    File "${MING_DLL_PATH}\libechonest.dll"
    File "${MING_DLL_PATH}\liblastfm.dll"
+   File "${MING_BIN}\libQTweetLib.dll"
+   File "${MING_BIN}\libjreen.dll"
+   File "${MING_BIN}\libqca.dll"
 
    File "${MING_LIB}\libclucene-core.dll"
    File "${MING_LIB}\libclucene-shared.dll"