Added missing file copying (patch 1204618)

[wxWidgets.git] / BuildCVS.txt

diff --git a/BuildCVS.txt b/BuildCVS.txt
index c630582fcc2daca3cd956cbddd424f6cfdcdc3a2..02b057a8f7d44ce1163fb7f9b2a58e4b566498e9 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -12,9 +12,8 @@ a) If using Microsoft Visual C++ 5.0 or 6.0
 
 Ensure that the command-line compiler and tools (including
 nmake) are installed and ready to run.  Depending on your
 
 Ensure that the command-line compiler and tools (including
 nmake) are installed and ready to run.  Depending on your

-installation there may be a batch file (named something like
-VCVARS32.BAT) that needs to be run to set correct environment
-varaibles and PATH entries.
+installation there may be a batch file (commonly named VCVARS32.BAT)
+that needs to be run to set correct environment variables and PATH entries.

 
 Continue with item c) below.
 
 
 Continue with item c) below.
 


@@ -23,53 +22,62 @@ b) If using the MinGW or Cygwin compilers
 
 You can get MinGW from  http://www.mingw.org/
 
 
 You can get MinGW from  http://www.mingw.org/
 

-Cygwin is available at  http://sources.redhat.com/cygwin/
+Cygwin is available at  http://www.cygwin.com/

 
 

-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
 
 
 -> 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
 
 
 
 c) Build instructions
 

--> Assumming that you installed the wxWindows sources
-   into c:\wxWin
--> Copy c:\wxWin\include\wx\msw\setup0.h
-   to   c:\wxWin\include\wx\msw\setup.h
--> Edit c:\wxWin\include\wx\msw\setup.h to choose
+Assumming that you installed the wxWindows sources
+into c:\wxWindows:
+
+-> Copy c:\wxWindows\include\wx\msw\setup0.h
+   to   c:\wxWindows\include\wx\msw\setup.h
+-> Edit c:\wxWindows\include\wx\msw\setup.h to choose

    the features you would like to compile wxWindows with[out].
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
    the features you would like to compile wxWindows with[out].
 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  

--> type: cd c:\wxWin\src\msw
--> type: make -f makefile.g95  (if using GNU tools)
+-> type: cd c:\wxWindows\build\msw
+-> type: make -f makefile.gcc  (if using GNU tools)

 or type: nmake -f makefile.vc   (if using MS VC++)
 or type: nmake -f makefile.vc   (if using MS VC++)

+etc.

 
    See also docs/msw/install.txt for additional compilation options.
 
 d) Borland (including free command line tools)
    Download tools from http://www.borland.com/downloads/
    
 
    See also docs/msw/install.txt for additional compilation options.
 
 d) Borland (including free command line tools)
    Download tools from http://www.borland.com/downloads/
    

-   See docs/msw/install.txt for details; in brief
+   See docs/msw/install.txt for details; in brief:
+
+-> type cd c:\wxWindows\build\msw
+-> type make -f makefile.bcc
+
+You can customize many things in the build process, detailed description is
+in docs/msw/install.txt.

 
 

--> type set WXWIN=c:\wxwindows
--> type cd %WXWIN%\src\msw
--> type make -f makefile.b32

 
 II) Unix ports
 --------------
 
 II) Unix ports
 --------------


@@ -80,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
 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
 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).
 
 Set WXWIN environment variable to the base directory such
 as ~/wxWindows (this is actually not really needed).


@@ -140,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
 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).
 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).


@@ -153,6 +162,7 @@ or type: ../configure
 
 VI) OS/2
 ----------------------------------------
 
 VI) OS/2
 ----------------------------------------

+No notes.

 
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------
 
 VII) Unix->Windows cross-compiling using configure
 --------------------------------------------------