mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-28 23:09:59 +02:00
Bundle libvlc-control.dll in the win32 installer
This commit is contained in:
parent
e53c7cecad
commit
7d4018a6fb
@ -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
|
||||
|
@ -18,6 +18,7 @@
|
||||
!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
|
||||
|
||||
@FILE_LIBVLC_DLL@
|
||||
@FILE_LIBVLC_CONTROL_DLL@
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
; General configuration ;
|
||||
@ -350,6 +351,9 @@ Section "Media player (required)" SEC01
|
||||
!ifdef LIBVLC_DLL
|
||||
!insertmacro InstallFile ${LIBVLC_DLL}
|
||||
!endif
|
||||
!ifdef LIBVLC_CONTROL_DLL
|
||||
!insertmacro InstallFile ${LIBVLC_CONTROL_DLL}
|
||||
!endif
|
||||
!insertmacro InstallFile *.txt
|
||||
|
||||
!insertmacro InstallFolder plugins
|
||||
@ -490,6 +494,9 @@ Section /o "Mozilla plugin" SEC03
|
||||
; !ifdef LIBVLC_DLL
|
||||
; CopyFiles ${LIBVLC_DLL} "$R2"
|
||||
; !endif
|
||||
; !ifdef LIBVLC_CONTROL_DLL
|
||||
; CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"
|
||||
; !endif
|
||||
; Goto "${Index}-Loop"
|
||||
|
||||
;"${Index}-End:"
|
||||
|
Loading…
Reference in New Issue
Block a user