X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=INSTALL.win32;h=5f5fa6672a91af4fb67046c884acd308f89a8a07;hb=3bed3c3385b506033c5c2e9d2d5880d819d042c1;hp=c7eb9d523c0659fa518f71efe968b1fc3b66ee15;hpb=2a6ec8069857dfc0c6159856aa2c1847e7a8e0d8;p=vlc

diff --git a/INSTALL.win32 b/INSTALL.win32
index c7eb9d523c..5f5fa6672a 100644
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -57,11 +57,6 @@ You first need to download a GNU/Linux cross-compiler version of mingw32.
 For Debian GNU/Linux users, you can use the mingw32, mingw32-binutils and
 mingw32-runtime packages.
 
-Or you can use our mingw32 gcc-3.3.1 cross-compiler package:
-http://download.videolan.org/pub/testing/win32/contrib-20060330-win32-bin-gcc-3.4.5-only.tar.bz2
-You will need to extract this package in your root directory (everything will
-be extracted in /usr/local/cross-tools).
-
 - compiling natively on Windoze with cygwin:
 You will need to download and run the setup.exe app from cygwin's web site
 (www.cygwin.com). You will also need to make sure you install at least the
@@ -137,32 +132,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 \
@@ -188,7 +158,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 \
@@ -230,7 +200,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
 
 
@@ -241,9 +211,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: