* Ultimate fixes to the win32 package generation.

diff --git a/Makefile b/Makefile
index 2dfe93df50eda43ee946eee7748888a6a1a7aab3..cf4598e84b7fc0dbebe2e684a8d98cd43b52c7dc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -372,7 +372,7 @@ package-win32:
        # Create installation script
        sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
        # Copy relevant files
-       cp vlc.exe plugins/directx.so plugins/gtk.so plugins/sdl.so tmp/ 
+       cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/ 
        cp INSTALL-win32.txt AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
                README README.libdvdcss FAQ TODO tmp/
        for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \

diff --git a/install-win32 b/install-win32
index eaefb9bd8cc132aaca7326944bcd274c4bcb22d7..c5fc17e2bab55d1d67088f5c19c323e1f24fef80 100644 (file)
--- a/install-win32
+++ b/install-win32
@@ -50,11 +50,10 @@ Section "Install"
        SetOutPath $INSTDIR\r
 \r
        File  vlc.exe\r
-       File  directx.so\r
-       File  gtk.so\r
-       File  sdl.so\r
+       File  *.so\r
+       File  *.dll\r
+       File  *.txt\r
 \r
-       File  INSTALL-win32.txt\r
        File  AUTHORS\r
        File  COPYING\r
        File  ChangeLog\r
@@ -64,16 +63,6 @@ Section "Install"
        File  FAQ\r
        File  TODO\r
 \r
-       File  SDL.dll\r
-       File  gtk-1.3.dll\r
-       File  gdk-1.3.dll\r
-       File  glib-1.3.dll\r
-       File  gmodule-1.3.dll\r
-       File  gnu-intl.dll\r
-\r
-       ;File  README-GTK.txt\r
-       File  README-SDL.txt\r
-\r
        File  /r share\r
 \r
        CreateDirectory "$SMPROGRAMS\VideoLAN"\r