Commit 88b0a696 authored by damienf's avatar damienf
Browse files

- vlc.win32.nsi.in: second attempt

parent c75bb43a
...@@ -5307,7 +5307,7 @@ AS_IF([test "x${enable_shared_libvlc}" = "x"], [enable_shared_libvlc=no]) ...@@ -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"]) 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="libvlc.dll"], FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"],
FILE_LIBVLC_DLL="" ) FILE_LIBVLC_DLL="" )
pic=no pic=no
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
!define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}" !define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"
!define LIBVLC_DLL "@FILE_LIBVLC_DLL@" "@FILE_LIBVLC_DLL@"
;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;
; General configuration ; ; General configuration ;
...@@ -328,8 +328,8 @@ Section "Media player (required)" SEC01 ...@@ -328,8 +328,8 @@ Section "Media player (required)" SEC01
!insertmacro InstallFile vlc.exe !insertmacro InstallFile vlc.exe
!insertmacro InstallFile vlc.exe.manifest !insertmacro InstallFile vlc.exe.manifest
!if LIBVLC_DLL != "" !ifdef LIBVLC_DLL
!insertmacro InstallFile $LIBVLC_DLL !insertmacro InstallFile ${LIBVLC_DLL}
!endif !endif
!insertmacro InstallFile *.txt !insertmacro InstallFile *.txt
...@@ -446,8 +446,8 @@ Section /o "Mozilla plugin" SEC03 ...@@ -446,8 +446,8 @@ Section /o "Mozilla plugin" SEC03
StrCmp $R2 "" "${Index}-Loop" "" StrCmp $R2 "" "${Index}-Loop" ""
CopyFiles "$INSTDIR\mozilla\*" "$R2" CopyFiles "$INSTDIR\mozilla\*" "$R2"
!if LIBVLC_DLL != "" !ifdef LIBVLC_DLL
CopyFiles $LIBVLC_DLL "$R2" CopyFiles ${LIBVLC_DLL} "$R2"
!endif !endif
Goto "${Index}-Loop" Goto "${Index}-Loop"
......
Supports Markdown
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