1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-28 18:00:13 +02:00

Use my packaged vlc in tomahawk.nsi instead of pre released binaries (those are crashing because they were compiled incompatibly).

This commit is contained in:
Dominik Schmidt
2011-05-25 03:46:21 +02:00
parent 20ad274dae
commit caa8878b25

View File

@@ -24,7 +24,8 @@
!define QT_DLL_PATH "${MING_BIN}" !define QT_DLL_PATH "${MING_BIN}"
!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers" !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats" !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. ; Increment installer revision number as part of this script.
@@ -341,9 +342,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
;SetOutPath "$INSTDIR\phonon_backend" ;SetOutPath "$INSTDIR\phonon_backend"
File "${VLC_PATH}\libvlc.dll" File "${VLC_PATH}\libvlc.dll"
File "${VLC_PATH}\libvlccore.dll" File "${VLC_PATH}\libvlccore.dll"
;SetOutPath "$INSTDIR\phonon_backend\plugins"
SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins"
File /r "${VLC_PATH}\plugins\" File /r "${VLC_PLUGIN_PATH}"
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"