Bundle libvlc-control.dll in the win32 installer

diff --git a/configure.ac b/configure.ac
index a6e2e3f35361d9d32861994a910dce409fd191b0..de47df544bcda809402b035370634709d2bda71d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5975,6 +5975,7 @@ dnl Pic and shared libvlc stuff
 dnl
 AS_IF([test "${SYS}" = "mingw32"], [
   FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
+  FILE_LIBVLC_CONTROL_DLL="!define LIBVLC_CONTROL_DLL libvlc-control.dll"
 ])
 
 dnl
@@ -6036,6 +6037,7 @@ AC_SUBST(LIBEXT)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 AC_SUBST(FILE_LIBVLC_DLL)
+AC_SUBST(FILE_LIBVLC_CONTROL_DLL)
 
 dnl Create vlc-config.in
 VLC_OUTPUT_VLC_CONFIG_IN

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 6f36c3fcdbc030c1b4bbbba0bf7c7a54628faa1c..c6dfbab0c308238b267417ef71a2f9faa1569fb5 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -18,6 +18,7 @@
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"\r
 \r
 @FILE_LIBVLC_DLL@\r
+@FILE_LIBVLC_CONTROL_DLL@\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; General configuration ;\r
@@ -350,6 +351,9 @@ Section "Media player (required)" SEC01
   !ifdef LIBVLC_DLL\r
   !insertmacro InstallFile ${LIBVLC_DLL}\r
   !endif\r
+  !ifdef LIBVLC_CONTROL_DLL\r
+  !insertmacro InstallFile ${LIBVLC_CONTROL_DLL}\r
+  !endif\r
   !insertmacro InstallFile *.txt\r
 \r
   !insertmacro InstallFolder plugins\r
@@ -490,6 +494,9 @@ Section /o "Mozilla plugin" SEC03
  ;  !ifdef LIBVLC_DLL\r
  ;  CopyFiles ${LIBVLC_DLL} "$R2"\r
  ;  !endif\r
+ ;  !ifdef LIBVLC_CONTROL_DLL\r
+ ;  CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"\r
+ ;  !endif\r
  ;  Goto "${Index}-Loop"\r
 \r
  ;"${Index}-End:"\r