* ./src/misc/configuration.c: when an invalid short option is found, use

[vlc] / INSTALL.win32

diff --git a/INSTALL.win32 b/INSTALL.win32
index b159be953412d04197a5eee88b34c10bef1ba1ef..93c5f2815c82f4b080a9dc9d354891fd8bdd99d3 100644 (file)
--- a/INSTALL.win32
+++ b/INSTALL.win32
@@ -14,8 +14,8 @@ To store a debug log of the current vlc session, you can use
 disable the GUI. You will end-up with a vlc.log file in your current directory.
 
 If you want to play a DVD, run vlc and click on the Disc option in the
-interface. You then have to type your drive letter in the 'Device name'
-box (eg. 'D' if this is the letter for your dvdrom drive).
+interface. You then have to type your drive letter followed by a colon in
+the 'Device name' box (eg. 'D:' if this is the letter for your dvdrom drive).
 
 Building VideoLAN Client from the source code
 =============================================
@@ -69,12 +69,6 @@ exception of the autoconf tool for which I'm using the autoconf-devel-2.52-4
 package (I had problems with 2.53a-1). You will need to make sure you install
 at least the gcc-mingw, mingw-runtime and w32api packages.
 
-Also note that currently, even when using the -mno-cygwin option, the final
-executable requires cygwin1.dll even if none of the objects linked to form the
-executable does depend on cygwin1.dll itself. I don't know yet why the linker
-plays this trick...
-
-
 NOTE: by default, the GTK package is configured to be installed in
 /usr/local/gtk-win32, if you want to change this path, then you need to edit
 the gtk-win32/bin/gtk-config file and change "gtk_dir=" accordingly.
@@ -102,7 +96,7 @@ If you are cross-compiling from Debian, you can use something
 along those lines:
 
   ./bootstrap; \
-  CC=i586-mingw32msvc-gcc \
+  CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
   ./configure --host=i586-mingw32msvc --build=i386-linux \
   --with-gtk-config-path=/usr/local/gtk-win32/bin \
   --with-sdl-config-path=/usr/local/SDL-1.2.3-win32/i386-mingw32msvc/bin \
@@ -113,7 +107,7 @@ If you are cross-compiling using the mingw32 package provided by
 www.videolan.org, you have to use something along those lines:
 
   ./bootstrap; \
-  CC=i586-mingw32msvc-gcc \
+  CC=i586-mingw32msvc-gcc CXX=i586-mingw32msvc-g++ \
   PATH=/usr/local/cross-tools/bin:$PATH \
   ./configure --host=i586-mingw32msvc --build=i386-linux \
   --with-gtk-config-path=/usr/local/gtk-win32/bin \
@@ -134,14 +128,14 @@ If you are using cygwin, you can build vlc with or without the unix emulation
 layer (without is usually better). To build without the emulaion layer, use
 something like this:
   ./bootstrap; \
-  CC="gcc -mno-cygwin" \
+  CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
   ./configure \
   --with-gtk-config-path=/cygdrive/c/dev/gtk-win32/bin \
   --with-sdl-config-path=/cygdrive/c/dev/SDL-1.2.3-win32/i386-mingw32msvc/bin \
   --with-directx=/cygdrive/c/dev/dxheaders \
   --with-dvdcss-tree=../libdvdcss-win
 If you want to use the emulation layer, then just omit the CC="gcc -mno-cygwin"
-line.
+CXX="g++ -mno-cygwin" line.
 
 Note: when using the --with-dvdcss-tree you need to compile the libdvdcss tree
 beforehand.
@@ -166,18 +160,13 @@ Building Win32 interface with bcc32 (Borland's compiler)
 (This stage is only necessary if you want to use the Win32 native interface.
  If you are happy with the GTK interface, then you can skip this section)
 
-1) Compile vlc as usual.
-
-2) From the plugin\win32 directory, use Borland C++ command-line tools
-as follows:
-bpr2mak intfwin.bpr -s \
-  | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -D__PLUGIN__ -DMODULE_NAME_IS_intfwin -DMODULE_NAME=intfwin#' \
-  > intfwin.mak                // Create a makefile from intfwin.bpr
-make -fintfwin                 // It's Borland's make utility !
+1) Install Borland C++ Builder, you will need bpr2mak and make.
 
-3) This should create a intfwin.so
-You can remove any other generated file.
+2) Make sure you have the bpr2mak and bcmake (NOT make!) commands in $PATH,
+they can be symlinks to the Borland bpr2mak and make utilities, or wrappers
+that call them through Wine if you are cross-compiling from Linux.
 
+3) Configure vlc as usual with the --enable-intfwin flag and build it.
 
 Well done, now you're ready to use vlc!
 =======================================