Updated mingw/cygwin information

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

BuildCVS.txt

@@ -16,45 +16,30 @@ varaibles and PATH entries.
 Continue with item c) below.
 
 
-b) If using the GNU MinGW32 or GNU CygWin32 compilers
+b) If using the GNU Mingw32 or GNU Cygwin32 compilers
 
-You'll need the compiler itself which is available from
+You can get Mingw32 from  http://www.mingw.org
 
-  http://www.cygwin.com
+Cygwin32 is available at  http://www.cygwin.com
 
-When using MingW32 you'll need GNU make which is a part
+The makefile might have small problems with Cygwin's tools
-of the CygWin32 toolchain and is also available as a stand
+so it is recommended to use Mingw32 and its toolchain instead
-alone port without the infamous Cygwin.dll from
+if possible.
-
-  http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32
-
-The makefile has small problems with Cygwin<69>s tools
-so it is recommended not to use these (but MingGW32
-and its make.exe).
 
 -> Set your path so that it includes the directory
    where your compiler and tools reside
 
-b-2) Using Mingw32 with gcc-2.95 and Anders Norlander's
+-> If your are using an old Mingw32 version (gcc-2.95 or older),
-     Win32 headers
+   you might need to fix some headers with the patches contained
+   in the wxWin\Mingw32-gcc295.patches file. PLEASE APPLY THESE
+   PATCHES BY HAND! There are apparently a few different versions
+   of the headers floating around. Note that these patches are
+   not needed if you are using Mingw32 gcc-2.95.2 or newer.
   
-Using the newer gcc-2.95/Noralander header combination
+-> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-will allow you to compile more of the MSW code, such
+   the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
-as OLE and Drag-n-Drop.
+   If using MINGW32, also set the MINGW32VERSION variable
-
+   appropiately.
-Instructions are similar to those for Regular Mingw32 except
-
-->Get the compiler from
-    ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
-
-->patch the gcc headers with info in wxWin\Mingw32-gcc295.patches.
-  PLEASE APPLY THESE PATCHES BY HAND! There are apparently a few
-  different versions of the headers floating around.
-
-->Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-  the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
-  If using MINGW32, also set the MINGW32VERSION variable
-  appropriately.
 
 
 c) Build instructions
@@ -64,9 +49,9 @@ c) Build instructions
 -> Copy c:\wxWin\include\wx\msw\setup0.h
    to   c:\wxWin\include\wx\msw\setup.h
 -> Edit c:\wxWin\include\wx\msw\setup.h so that
-   most features are enabled (i.e. defined to 1) with
+   most features are enabled (i.e. defined to 1), for example:
    #define wxUSE_ODBC          0
-   #define wxUSE_SOCKETS       0
+   #define wxUSE_SOCKETS       1
    #define wxUSE_HTML          1
    #define wxUSE_THREADS       1
    #define wxUSE_FS_INET       0
@@ -77,11 +62,9 @@ c) Build instructions
    #define wxUSE_LIBJPEG       1
    #define wxUSE_LIBPNG        1
 
-   and iostreams ares disabled with
+   and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
-   note: ODBC and SOCKETS can be 1 for gcc-2.95
-
 -> type: cd c:\wxWin\src\msw
 -> type: make -f makefile.g95  (if using GNU tools)
 or type: make -f makefile.vc   (if using MS VC++)

docs/msw/install.txt

@@ -414,16 +414,16 @@ Here are the steps required:
   extra files to use the wxWindows makefiles. You can find these
   files in ports/mingw32 on the ftp site or CD-ROM, as extra.zip.
   These should be extracted to the Mingw32 directory.
-  If you have already have downloaded bison, flex, make, rm, cp, mv
+  If you have alread downloaded bison, flex, make, rm, cp, mv
   from elsewhere, you won't need this.
 
   If using Mingw32 2.8.1, see also see mingw32.txt in this directory
   (docs/msw) about a fix that has to be applied to a Mingw32 header file.
 
   If using Mingw32 2.95 and below with wxWindows 2.1 or above, you
-  must hand-patch in Mingw32-gcc295.patches (located in the top-level of the
+  must hand-patch with Mingw32-gcc295.patches (located in the
-  wxWindows 2 installation). Mingw32 2.95.2 and above contain the
+  top-level of the wxWindows 2 installation). Mingw32 2.95.2
-  fixes already.
+  and above contain the fixes already.
 
 - Modify the file wx/src/cygnus.bat (or mingw32.bat or mingegcs.bat)
   to set up appropriate variables, if necessary mounting drives.
@@ -439,9 +439,6 @@ Here are the steps required:
   If using MINGW32, also set the MINGW32VERSION variable
   appropriately.
 
-- Mingw32 may not support winsock.h, so if you have a problem
-  here, comment out socket-related files in src/msw/makefile.g95.
-
 - Set your WXWIN variable to where wxWindows is installed.
   *** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
   backslashes.
@@ -487,9 +484,9 @@ Notes:
 
    (a missing bracket).
 
-4. If there's a problem with the copy command in
+4. If there's a problem with the copy or remove commands in
    src/msw/makefile.g95, you may need to change the COPY and
-   COPYSEP variables in makeg95.env.
+   RM variables in makeg95.env.
 
 5. If there's a problem executing the windres program, try
    commenting out RCPREPROCESSOR in makeg95.env.
@@ -512,7 +509,7 @@ References:
  - The GNU-WIN32 site is at
      http://www.cygnus.com/gnu-win32/
  - Mingw32 is available at:
-     ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
+     ftp://www,mingw.org
  - See also http://web.ukonline.co.uk/julian.smart/wxwin/gnuwin32.htm
 
 TWIN32 and gcc on Linux
@@ -542,5 +539,6 @@ General Notes
 - If you are installing wxWindows 2 from CVS, you may find that
   include/wx/msw/setup.h is missing. This is deliberate, to avoid
   developers' different setup.h configurations getting confused.
-  Please copy setup0.h to setup.h before compiling.
+  Please copy setup0.h to setup.h before compiling. Also, read
+  the BuildCVS.txt for other hints.