More wxMac compilation fixes.

[wxWidgets.git] / BuildCVS.txt

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 998a8963888e4f3e8a1b201b0d8af08866522aa9..b7ddba7b44fe2e9b28f7d9a51b4380587905e2ab 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -25,23 +25,27 @@ You can get MinGW from  http://www.mingw.org/
 
 Cygwin is available at  http://sources.redhat.com/cygwin/
 
-The makefile might have small problems with Cygwin's tools
-so it is recommended to use MinGW and its toolchain instead
-if possible.
+If you are using Cygwin or MinGW together with the MSYS environment, you
+can build the library using configure (see "Unix ports" and
+"Windows using configure" below). You can also
+build wxWindows without configure using native makefile, but only with
+MinGW. Using Cygwin together with Windows makefile is no longer supported.
+
+If building with Mingw without configure:
 
 -> Set your path so that it includes the directory
    where your compiler and tools reside
 
--> If your are using an old MinGW version (gcc-2.95 or older),
-   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 MinGW gcc-2.95.2 or newer.
-  
--> Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
-   the file to either 1 (you have MinGW) or 0 (you have Cygwin).
-   Also set the MINGW32VERSION variable appropiately.
+-> Make sure you have GNU Make installed. It must be Windows native version.
+   Download it from http://www.mingw.org, the executable will be called
+   mingw32-make.exe.
+
+-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
+   but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
+   have to change variable GCC_VERSION in config.gcc (see msw/install.txt
+   for details).
+
+If using configure, Unix instructions apply.
 
 
 c) Build instructions
@@ -56,10 +60,10 @@ c) Build instructions
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
--> type: cd c:\wxWin\src\msw
--> type: set WXWIN=c:\wxWin
--> type: make -f makefile.g95  (if using GNU tools)
+-> type: cd c:\wxWin\build\win32
+-> type: make -f makefile.gcc  (if using GNU tools)
 or type: nmake -f makefile.vc   (if using MS VC++)
+etc.
 
    See also docs/msw/install.txt for additional compilation options.
 
@@ -68,9 +72,12 @@ d) Borland (including free command line tools)
    
    See docs/msw/install.txt for details; in brief
 
--> type set WXWIN=c:\wxwindows
--> type cd %WXWIN%\src\msw
--> type make -f makefile.b32
+-> type cd %WXWIN%\build\win32
+-> type make -f makefile.bcc
+
+You can customize many things in the build process, detailed description is
+in docs/msw/install.txt.
+
 
 II) Unix ports
 --------------
@@ -81,10 +88,11 @@ that works without libtool and automake, using only
 configure to create what is needed.
 
 In order to create configure, you need to have the
-GNU autoconf package (version 2.13 or 2.14) installed
+GNU autoconf package (version > 2.54) installed
 on your system and type run "autoconf" in the base
 directory (or run the autogen.sh script in the same
-directory, which just calls autoconf).
+directory, which just calls autoconf). Note that you usually don't
+need to do this because configure is included in cVS.
 
 Set WXWIN environment variable to the base directory such
 as ~/wxWindows (this is actually not really needed).
@@ -141,7 +149,7 @@ you will need to register at the Apple Developer web site (this is a free
 registration) in order to download the Developer Tools installer.
 
 In order to create configure, you need to have the
-GNU autoconf package (version 2.13 or 2.14) installed
+GNU autoconf package (version >= 2.54) installed
 on your system and type run "autoconf" in the base
 directory (or run the autogen.sh script in the same
 directory, which just calls autoconf).