X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=INSTALL.win32;h=6ad01e51b52930b34a2028189364f3d6623cd5a1;hb=7686840e5c2b384eab661455a5e532a97c669e96;hp=07c8449fe3652976362ba06879dc17eaa75ddd9c;hpb=beadaafde280dcff400523f52fca1ad8ed108417;p=vlc

diff --git a/INSTALL.win32 b/INSTALL.win32
index 07c8449fe3..6ad01e51b5 100644
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -1,5 +1,3 @@
-$Id$
-
 INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
 
 
@@ -31,6 +29,13 @@ If you want to build VLC from sources, you can do it in several ways:
   NOTE: This is the PREFERRED way of building VLC natively (the others
   are not as much tested so expect more difficulties with them).
 
+  Read http://wiki.videolan.org/Win32CompileCygwinNew to have a complete HOWTO
+
+- On GNU/Linux, using the mingw32 cross-compiler.
+  This method is  preferred over all the others.
+
+UNSUPPORTED METHODS
+-------------------
 - natively on Windows, using MSYS+MINGW (www.mingw.org)
   (MSYS is a minimal build environment to compile Unixish projects under
   windoze. It provides all the common Unix tools like sh, gmake...)
@@ -46,8 +51,6 @@ If you want to build VLC from sources, you can do it in several ways:
     with the --fast-mutex --win9x-cv-method=1 options because the debugger
     usually loses signals sent by PulseEvent() )
 
-- or on GNU/Linux, using the mingw32 cross-compiler.
-
 Getting the right compiler tools
 ================================
 
@@ -113,13 +116,14 @@ Configuring the build
 Once you've got all the files you need in place, you need to configure the
 build with the `./configure' script.
 
-I'll assume that you are using the pre-compiled 3rd party libraries I'm
+I'll assume that you are using the pre-compiled 3rd party libraries we are
 providing and that they are in /usr/win32.
 
 If you are cross-compiling from Debian, you can use something
 along those lines:
 
   ./bootstrap && \
+  PATH=/usr/win32/bin:$PATH \
   PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
   CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
   LDFLAGS=-L/usr/win32/lib \
@@ -132,32 +136,7 @@ along those lines:
       --with-wx-config-path=/usr/win32/bin \
       --with-freetype-config-path=/usr/win32/bin \
       --with-fribidi-config-path=/usr/win32/bin \
-      --enable-livedotcom --with-livedotcom-tree=/usr/win32/live.com \
-      --enable-caca --with-caca-config-path=/usr/win32/bin \
-      --with-xml2-config-path=/usr/win32/bin \
-      --with-dvdnav-config-path=/usr/win32/bin \
-      --disable-cddax --disable-vcdx --enable-goom \
-      --enable-twolame --enable-dvdread \
-      --enable-debug
-
-If you are cross-compiling with our gcc-3.3.1 package, you can use something
-along those lines:
-
-  ./bootstrap && \
-  PATH=/usr/local/mingw/bin:$PATH \
-  PKG_CONFIG_LIBDIR=/usr/win32/lib/pkgconfig \
-  CPPFLAGS=-I/usr/win32/include \
-  LDFLAGS=-L/usr/win32/lib \
-  CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
-  ./configure --host=i586-mingw32msvc --build=i386-linux \
-      --disable-gtk \
-      --enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
-      --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --with-ffmpeg-zlib --enable-faad --enable-flac --enable-theora \
-      --with-wx-config-path=/usr/win32/bin \
-      --with-freetype-config-path=/usr/win32/bin \
-      --with-fribidi-config-path=/usr/win32/bin \
-      --enable-livedotcom --with-livedotcom-tree=/usr/win32/live.com \
+      --enable-live555 --with-live555-tree=/usr/win32/live.com \
       --enable-caca --with-caca-config-path=/usr/win32/bin \
       --with-xml2-config-path=/usr/win32/bin \
       --with-dvdnav-config-path=/usr/win32/bin \
@@ -171,6 +150,7 @@ hasn't been tested in about a year or so. So to build without the
 emulation layer, use something like this:
 
   ./bootstrap && \
+  PATH=/usr/win32/bin:$PATH \
   PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig \
   CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
   LDFLAGS=-L/usr/win32/lib \
@@ -183,7 +163,7 @@ emulation layer, use something like this:
       --with-wx-config-path=/usr/win32/bin \
       --with-freetype-config-path=/usr/win32/bin \
       --with-fribidi-config-path=/usr/win32/bin \
-      --enable-livedotcom --with-livedotcom-tree=/usr/win32/live.com \
+      --enable-live555 --with-live555-tree=/usr/win32/live.com \
       --enable-caca --with-caca-config-path=/usr/win32/bin \
       --with-xml2-config-path=/usr/win32/bin \
       --with-dvdnav-config-path=/usr/win32/bin \
@@ -198,6 +178,7 @@ If you are compiling with MSYS/MINGW, then you can use something along those
 lines:
   ./bootstrap && \
   PKG_CONFIG_PATH=/usr/win32/lib/pkgconfig \
+  PATH=/usr/win32/bin:$PATH \
   CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
   LDFLAGS=-L/usr/win32/lib \
   ./configure \
@@ -225,7 +206,7 @@ the CFLAGS, LDFLAGS and --with-foo-config-path=.
       --enable-ffmpeg --enable-faad --enable-flac --enable-theora \
       --disable-cddax --disable-vcdx --enable-goom \
       --enable-twolame --enable-dvdread \
-      --enable-mkv --enable-caca \
+      --enable-mkv --enable-caca --enable-live555\
       --enable-debug
 
 
@@ -236,9 +217,6 @@ Actually Compiling the VLC source
 
 Once configured, to build VLC, just run `make'.
 
-( If you are using our gcc-3.3.1 cross-compiler you'll need to use:
-  PATH=/usr/local/mingw/bin:$PATH make )
-
 Once the compilation is done, you can either run VLC directly from the source
 tree or you can build self-contained VLC packages with the following
 'make' rules: