Commit 7d4018a6 authored by Olivier Aubert's avatar Olivier Aubert

Bundle libvlc-control.dll in the win32 installer

parent e53c7cec
...@@ -5975,6 +5975,7 @@ dnl Pic and shared libvlc stuff ...@@ -5975,6 +5975,7 @@ dnl Pic and shared libvlc stuff
dnl dnl
AS_IF([test "${SYS}" = "mingw32"], [ AS_IF([test "${SYS}" = "mingw32"], [
FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll" FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
FILE_LIBVLC_CONTROL_DLL="!define LIBVLC_CONTROL_DLL libvlc-control.dll"
]) ])
dnl dnl
...@@ -6036,6 +6037,7 @@ AC_SUBST(LIBEXT) ...@@ -6036,6 +6037,7 @@ AC_SUBST(LIBEXT)
AC_SUBST(AM_CPPFLAGS) AC_SUBST(AM_CPPFLAGS)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(FILE_LIBVLC_DLL) AC_SUBST(FILE_LIBVLC_DLL)
AC_SUBST(FILE_LIBVLC_CONTROL_DLL)
dnl Create vlc-config.in dnl Create vlc-config.in
VLC_OUTPUT_VLC_CONFIG_IN VLC_OUTPUT_VLC_CONFIG_IN
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
!define MUI_LANGDLL_REGISTRY_VALUENAME "Language" !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
@FILE_LIBVLC_DLL@ @FILE_LIBVLC_DLL@
@FILE_LIBVLC_CONTROL_DLL@
;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;
; General configuration ; ; General configuration ;
...@@ -350,6 +351,9 @@ Section "Media player (required)" SEC01 ...@@ -350,6 +351,9 @@ Section "Media player (required)" SEC01
!ifdef LIBVLC_DLL !ifdef LIBVLC_DLL
!insertmacro InstallFile ${LIBVLC_DLL} !insertmacro InstallFile ${LIBVLC_DLL}
!endif !endif
!ifdef LIBVLC_CONTROL_DLL
!insertmacro InstallFile ${LIBVLC_CONTROL_DLL}
!endif
!insertmacro InstallFile *.txt !insertmacro InstallFile *.txt
!insertmacro InstallFolder plugins !insertmacro InstallFolder plugins
...@@ -490,6 +494,9 @@ Section /o "Mozilla plugin" SEC03 ...@@ -490,6 +494,9 @@ Section /o "Mozilla plugin" SEC03
; !ifdef LIBVLC_DLL ; !ifdef LIBVLC_DLL
; CopyFiles ${LIBVLC_DLL} "$R2" ; CopyFiles ${LIBVLC_DLL} "$R2"
; !endif ; !endif
; !ifdef LIBVLC_CONTROL_DLL
; CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"
; !endif
; Goto "${Index}-Loop" ; Goto "${Index}-Loop"
;"${Index}-End:" ;"${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