Commit c75bb43a authored by Damien Fouilleul's avatar Damien Fouilleul

vlc.win32.nsi: libvlc.dll needs be copied into mozilla plugins directory as well.

parent 8f08042c
......@@ -5307,7 +5307,7 @@ AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no])
AM_CONDITIONAL(BUILD_SHARED, [test "${enable_shared_libvlc}" != "no"])
AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "no"], [
AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
FILE_LIBVLC_DLL="!insertmacro InstallFile libvlc.dll"],
FILE_LIBVLC_DLL="libvlc.dll"],
FILE_LIBVLC_DLL="" )
pic=no
......
......@@ -13,6 +13,8 @@
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
!define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"
!define LIBVLC_DLL "@FILE_LIBVLC_DLL@"
;;;;;;;;;;;;;;;;;;;;;;;;;
; General configuration ;
;;;;;;;;;;;;;;;;;;;;;;;;;
......@@ -326,7 +328,9 @@ Section "Media player (required)" SEC01
!insertmacro InstallFile vlc.exe
!insertmacro InstallFile vlc.exe.manifest
@FILE_LIBVLC_DLL@
!if LIBVLC_DLL != ""
!insertmacro InstallFile $LIBVLC_DLL
!endif
!insertmacro InstallFile *.txt
!insertmacro InstallFolder plugins
......@@ -442,6 +446,9 @@ Section /o "Mozilla plugin" SEC03
StrCmp $R2 "" "${Index}-Loop" ""
CopyFiles "$INSTDIR\mozilla\*" "$R2"
!if LIBVLC_DLL != ""
CopyFiles $LIBVLC_DLL "$R2"
!endif
Goto "${Index}-Loop"
"${Index}-End:"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment