From caa8878b25c47e092cc67b94e554730979b64c2a Mon Sep 17 00:00:00 2001
From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Wed, 25 May 2011 03:46:21 +0200
Subject: [PATCH] Use my packaged vlc in tomahawk.nsi instead of pre released
 binaries (those are crashing because they were compiled incompatibly).

---
 admin/win/nsi/tomahawk.nsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/win/nsi/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi
index 6720ae0f6..d790ba516 100644
--- a/admin/win/nsi/tomahawk.nsi
+++ b/admin/win/nsi/tomahawk.nsi
@@ -24,7 +24,8 @@
 !define QT_DLL_PATH "${MING_BIN}"
 !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
-!define VLC_PATH "..\vlc"
+!define VLC_PATH "${MING_BIN}"
+!define VLC_PLUGIN_PATH "${MING_LIB}\vlc\plugins"
 
 ;-----------------------------------------------------------------------------
 ; Increment installer revision number as part of this script.
@@ -341,9 +342,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    ;SetOutPath "$INSTDIR\phonon_backend"
    File "${VLC_PATH}\libvlc.dll"
    File "${VLC_PATH}\libvlccore.dll"
-   ;SetOutPath "$INSTDIR\phonon_backend\plugins"
    SetOutPath "$INSTDIR\plugins"
-   File /r "${VLC_PATH}\plugins\"
+   File /r "${VLC_PLUGIN_PATH}"
    SetOutPath "$INSTDIR"