Commit 92e730c1 authored by Clément Stenac's avatar Clément Stenac

Ship libvlc.dll in installer if built in shared mode

parent e26fe1f6
...@@ -5258,7 +5258,8 @@ AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no]) ...@@ -5258,7 +5258,8 @@ AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no])
AM_CONDITIONAL(BUILD_SHARED, [test "${enable_shared_libvlc}" != "no"]) AM_CONDITIONAL(BUILD_SHARED, [test "${enable_shared_libvlc}" != "no"])
AS_IF([test "${enable_shared_libvlc}" != "no" || test "${enable_libtool}" != "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.]) AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
]) FILE_LIBVLC_DLL="File libvlc.dll"],
FILE_LIBVLC_DLL="" )
pic=no pic=no
AS_IF([test "${build_pic}" = "yes"], [pic=pic]) AS_IF([test "${build_pic}" = "yes"], [pic=pic])
...@@ -5335,6 +5336,7 @@ AC_SUBST(LIBEXT) ...@@ -5335,6 +5336,7 @@ AC_SUBST(LIBEXT)
AC_SUBST(INCLUDES) AC_SUBST(INCLUDES)
AC_SUBST(ALL_LINGUAS) AC_SUBST(ALL_LINGUAS)
AC_SUBST(MACOSX_DEPLOYMENT_TARGET) AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(FILE_LIBVLC_DLL)
dnl Import substitutions generated by bootstrap dnl Import substitutions generated by bootstrap
VLC_SUBSTS VLC_SUBSTS
...@@ -5343,6 +5345,7 @@ dnl Create vlc-config.in ...@@ -5343,6 +5345,7 @@ dnl Create vlc-config.in
VLC_OUTPUT_VLC_CONFIG_IN VLC_OUTPUT_VLC_CONFIG_IN
AC_CONFIG_FILES([ AC_CONFIG_FILES([
vlc.win32.nsi
Makefile Makefile
activex/Makefile activex/Makefile
activex/axvlc.inf activex/axvlc.inf
......
...@@ -265,6 +265,7 @@ Section "Media player (required)" SEC01 ...@@ -265,6 +265,7 @@ Section "Media player (required)" SEC01
File vlc.exe File vlc.exe
File vlc.exe.manifest File vlc.exe.manifest
@FILE_LIBVLC_DLL@
File *.txt File *.txt
File /r plugins File /r plugins
......
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