X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=INSTALL.win32;h=a46cb6105f27c026a3a149c79f237c1c5df86260;hb=06212a31521e363780bca27eab12e06885c375c1;hp=2d75a10d43e5311829f0ea5bc6d429f17f2c35ab;hpb=3e8db97410394c79bd851db80f2a0a345890f425;p=vlc

diff --git a/INSTALL.win32 b/INSTALL.win32
index 2d75a10d43..a46cb6105f 100644
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -32,7 +32,7 @@ If you want to build VLC from sources, you can do it in several ways:
   are not as much tested so expect more difficulties with them).
 
 - natively on Windows, using MSYS+MINGW (www.mingw.org)
-  (MSYS is a minimal build environnement to compile Unixish projects under
+  (MSYS is a minimal build environment to compile Unixish projects under
   windoze. It provides all the common Unix tools like sh, gmake...)
   Please note that the gettext utilities are not included in the default
   MSYS/MINGW packages so you won't be able to build VLC with i18n support.
@@ -76,7 +76,7 @@ from MSYS (just rename or remove c:\msys\1.0\mingw\bin\make.exe).
 
 http://www.mingw.org/download.shtml
 http://prdownloads.sf.net/mingw/MSYS-1.0.9.exe
-http://prdownloads.sf.net/mingw/MinGW-3.0.0-rc3.exe
+http://prdownloads.sf.net/mingw/MinGW-3.1.0-1.exe
 http://prdownloads.sf.net/mingw/msysDTK-1.0.1.exe
 
 Getting the additional libraries
@@ -94,13 +94,13 @@ 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-20040229-win32-bin-gcc3.3.1-only.tar.bz2
+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: 
 
-  tar xjvf contrib-20040229-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 /". 
 
@@ -124,12 +124,10 @@ along those lines:
   LDFLAGS=-L/usr/win32/lib \
   CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
   ./configure --host=i586-mingw32msvc --build=i386-linux \
-      --disable-sdl --disable-gtk \
-      --enable-nls \
+      --disable-gtk \
+      --enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
       --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --enable-faad \
-      --enable-flac \
-      --enable-theora \
+      --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 \
@@ -137,7 +135,8 @@ along those lines:
       --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 \
+      --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
@@ -149,12 +148,10 @@ along those lines:
   LDFLAGS=-L/usr/win32/lib \
   CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
   ./configure --host=i586-mingw32msvc --build=i386-linux \
-      --disable-sdl --disable-gtk \
-      --enable-nls \
+      --disable-gtk \
+      --enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
       --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --enable-faad \
-      --enable-flac \
-      --enable-theora \
+      --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 \
@@ -162,7 +159,8 @@ along those lines:
       --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 \
+      --disable-cddax --disable-vcdx --enable-goom \
+      --enable-twolame --enable-dvdread \
       --enable-debug
 
 If you are using cygwin, you can build VLC with or without the POSIX
@@ -175,12 +173,10 @@ emulation layer, use something like this:
   LDFLAGS=-L/usr/win32/lib \
   CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
   ./configure \
-      --disable-sdl --disable-gtk \
-      --enable-nls \
+      --disable-gtk \
+      --enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
       --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --enable-faad \
-      --enable-flac \
-      --enable-theora \
+      --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 \
@@ -188,7 +184,8 @@ emulation layer, use something like this:
       --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 \
+      --disable-cddax --disable-vcdx --enable-goom \
+      --enable-twolame --enable-dvdread \
       --enable-debug
 
 If you want to use the emulation layer, then just omit the CC="gcc -mno-cygwin"
@@ -200,19 +197,18 @@ lines:
   CPPFLAGS="-I/usr/win32/include -I/usr/win32/include/ebml" \
   LDFLAGS=-L/usr/win32/lib \
   ./configure \
-      --disable-sdl --disable-gtk \
-      --enable-nls \
+      --disable-gtk \
+      --enable-nls --enable-sdl --with-sdl-config-path=/usr/win32/bin \
       --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \
-      --enable-faad \
-      --enable-flac \
-      --enable-theora \
+      --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-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 \
+      --disable-cddax --disable-vcdx --enable-goom \
+      --enable-twolame --enable-dvdread \
       --disable-mkv \
       --enable-debug
 
@@ -226,5 +222,20 @@ 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:
+
+  make package-win32-base
+   will create a subdirectory named vlc-x.x.x with all the binaries
+   'stripped' (ie. without any debugging symbols).
+
+  make package-win32-zip
+   Same as above but will package the directory in a zip file.
+
+  make package-win32
+   Same as above but will also create an auto-installer package. You will need
+   to have NSIS installed in its default location for this to work.
+
 Well done, now you're ready to use VLC!
 =======================================