Document the new win32 contrib way.

diff --git a/INSTALL.win32 b/INSTALL.win32
index a46cb6105f27c026a3a149c79f237c1c5df86260..f7e84c0545cd447ae4211733442ecc6cffa65645 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -88,21 +88,25 @@ or mpeg4 video decoding, etc...
 Depending on your needs you will have to compile/install some or all of these
 external libraries.
 
-They can be found here (source code):
-http://download.videolan.org/pub/testing/contrib/
+* They can be found here (source code):
+  http://download.videolan.org/pub/testing/contrib/
 
-We also provide a package with all the libraries already compiled so it is
-actually really easy to compile a full-featured version of vlc (these compiled
-libraries will only work with mingw or cygwin):
-http://download.videolan.org/pub/testing/win32/contrib-20040902-win32-bin-gcc3.3.1-only.tar.bz2 (Check out fo more recent versions at the same location). 
+* We also provide a package with all the libraries already compiled so it is
+  actually really easy to compile a full-featured version of vlc (these compiled
+  libraries will only work with mingw or cygwin):
+  http://download.videolan.org/pub/testing/win32/contrib-20040902-win32-bin-gcc3.3.1-only.tar.bz2 (Check out fo more recent versions at the same location). 
 
-All you need to do is extract it in your root directory (the include files
-and libraries will be put in /usr/win32). You can do this with the following
-command: 
+  All you need to do is extract it in your root directory (the include files
+  and libraries will be put in /usr/win32). You can do this with the following
+  command: 
 
-  tar xjvf contrib-20040902-win32-bin-gcc3.3.1-only.tar.bz2 -C /
+    tar xjvf contrib-20040902-win32-bin-gcc3.3.1-only.tar.bz2 -C /
 
-Please note the "-C /". 
+  Please note the "-C /". 
+
+* An automated way of building the contrib libraries is provided in 
+  extra/contrib. It will download, configure and build the libraries.
+  See the extras/contrib/README for more info.
 
 A complete list of the libraries on which we depend can be found here:
 http://developers.videolan.org/vlc/
@@ -212,6 +216,19 @@ lines:
       --disable-mkv \
       --enable-debug
 
+If you have used the "extras/contrib" way, you don't need to precise 
+the CFLAGS, LDFLAGS and --with-foo-config-path=.
+ ./bootstrap && \
+  ./configure \
+      --disable-gtk \
+      --enable-nls --enable-sdl \
+      --enable-ffmpeg --enable-faad --enable-flac --enable-theora \
+      --disable-cddax --disable-vcdx --enable-goom \
+      --enable-twolame --enable-dvdread \
+      --enable-mkv --enable-caca \
+      --enable-debug
+
+
 See `./configure --help' for more information.
 
 Actually Compiling the VLC source

diff --git a/extras/contrib/README b/extras/contrib/README
index fdd6b7280d57c76daa6f0996ed737da21e9dc3e0..b9912f6a5942f54361113e26642c1ec811505028 100644 (file)
--- a/extras/contrib/README
+++ b/extras/contrib/README
@@ -1,6 +1,6 @@
 This is the contrib build system for VLC Media Player. It has been
-primarily developed for Mac OS X, though it should be easy to adapt to
-other operating systems.
+primarily developed for Mac, it has been adapted for BeOs and win32.
+It would be not too difficult to extend it to other sytem.
 
 To use it, first in the contrib directory, type :
        ./bootstrap
@@ -19,7 +19,7 @@ make bin IS NOT WORKING atm USE make src
 
 Once the contribs are built, you can start building VLC.
 See: http://developers.videolan.org/vlc/osx-compile.html 
-for more details on that.
+or INSTALL.win32 for more details on that.
 
 Happy hacking.
 --Meuuh 2003-11-15