Commit 8acfd9b4 authored by Sam Hocevar's avatar Sam Hocevar

  * Ultimate fixes to the win32 package generation.
parent 00201762
......@@ -392,12 +392,12 @@ 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 \
gnu-intl.dll SDL.dll README-SDL.txt ; \
do cp ../win32-libs/$$file tmp/ ; done
do cp ${DLL_PATH}/$$file tmp/ ; done
mkdir tmp/share
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/share/ ; done
......
......@@ -51,6 +51,7 @@ SHELL = @SHELL@
RANLIB = @RANLIB@
WINDRES = @WINDRES@
MOC = @MOC@
DLL_PATH = @DLL_PATH@
#
# Installation environment
......
This diff is collapsed.
......@@ -1218,6 +1218,16 @@ AC_ARG_ENABLE(plugins,
PLUGINS=
fi])
dnl
dnl DLLs - used for Win32 package build
dnl
DLL_PATH=.
AC_ARG_WITH(dll-path,
[ --with-dll-path=path Path to Win32 DLLs (default search in \$PWD)],
[ if test "x$withval" != "xno"
then
DLL_PATH=$withval
fi ])
dnl
dnl Configuration is finished
......@@ -1237,9 +1247,9 @@ AC_SUBST(GPROF)
AC_SUBST(OPTIMS)
AC_SUBST(TUNING)
AC_SUBST(RELEASE)
AC_SUBST(NEED_GETOPT)
AC_SUBST(MOC)
AC_SUBST(WINDRES)
AC_SUBST(DLL_PATH)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......@@ -1295,6 +1305,7 @@ AC_SUBST(CFLAGS_XVIDEO)
AC_SUBST(OBJ_DVD)
AC_SUBST(OBJ_LIBDVDCSS)
AC_SUBST(NEED_GETOPT)
AC_SUBST(NEED_LIBDVDCSS)
AC_OUTPUT([Makefile.opts include/config.h po/Makefile.in])
......
......@@ -50,11 +50,10 @@ Section "Install"
SetOutPath $INSTDIR
File vlc.exe
File directx.so
File gtk.so
File sdl.so
File *.so
File *.dll
File *.txt
File INSTALL-win32.txt
File AUTHORS
File COPYING
File ChangeLog
......@@ -64,16 +63,6 @@ Section "Install"
File FAQ
File TODO
File SDL.dll
File gtk-1.3.dll
File gdk-1.3.dll
File glib-1.3.dll
File gmodule-1.3.dll
File gnu-intl.dll
;File README-GTK.txt
File README-SDL.txt
File /r share
CreateDirectory "$SMPROGRAMS\VideoLAN"
......
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