Correct placement of header listed in wx/wx.h

[wxWidgets.git] / BuildCVS.txt

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 998a8963888e4f3e8a1b201b0d8af08866522aa9..1e85521ae495a8bbc6dd5905c80b4286600595d2 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,54 +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 wxWidgets 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
-   the features you would like to compile wxWindows with[out].
+Assumming that you installed the wxWidgets sources
+into c:\wxWidgets:
+
+-> Copy c:\wxWidgets\include\wx\msw\setup0.h
+   to   c:\wxWidgets\include\wx\msw\setup.h
+-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
+   the features you would like to compile wxWidgets with[out].

 
    and std iostreams are disabled with
    #define wxUSE_STD_IOSTREAM   0
  
 
    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:\wxWidgets\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:\wxWidgets\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
 --------------


@@ -81,15 +88,16 @@ 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
 
 Set WXWIN environment variable to the base directory such

-as ~/wxWindows (this is actually not really needed).
+as ~/wxWidgets (this is actually not really needed).

 
 

--> type: export WXWIN=~/wxWindows
+-> type: export WXWIN=~/wxWidgets

 -> type: md mybuild
 -> type: cd mybuild
 -> type: ../configure --with-motif
 -> type: md mybuild
 -> type: cd mybuild
 -> type: ../configure --with-motif


@@ -108,7 +116,7 @@ yet complete).
 III) Windows using configure
 ----------------------------------------
 
 III) Windows using configure
 ----------------------------------------
 

-wxWindows can be built on Windows using MSYS (see
+wxWidgets can be built on Windows using MSYS (see

 http://www.mingw.org/), which is a POSIX build environment
 for Windows. With MSYS you can just ./configure && make (see also VII,
 Unix->Windows cross-compiling using configure).
 http://www.mingw.org/), which is a POSIX build environment
 for Windows. With MSYS you can just ./configure && make (see also VII,
 Unix->Windows cross-compiling using configure).


@@ -120,7 +128,7 @@ IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
 ----------------------------------------
 
 Refer to the readme.txt and install.txt files in docs/mac to build
 ----------------------------------------
 
 Refer to the readme.txt and install.txt files in docs/mac to build

-wxWindows under Classic Mac OS using CodeWarrior.
+wxWidgets under Classic Mac OS using CodeWarrior.

 
 If you are checking out the CVS sources using cvs under Mac OS X and
 compiling under Classic Mac OS:
 
 If you are checking out the CVS sources using cvs under Mac OS X and
 compiling under Classic Mac OS:


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


@@ -154,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
 --------------------------------------------------


@@ -173,9 +182,9 @@ preferable if you write portable C(++). ]
 
 You might want to build both Unix and Windows binaries in the same source
 tree; to do this make subdirs for each e.g. unix and win32. If you've
 
 You might want to build both Unix and Windows binaries in the same source
 tree; to do this make subdirs for each e.g. unix and win32. If you've

-already build wxWindows in the main dir, do a 'make distclean' there,
+already build wxWidgets in the main dir, do a 'make distclean' there,

 otherwise configure will get confused. (In any case, read the section 'Unix
 otherwise configure will get confused. (In any case, read the section 'Unix

-using configure' and make sure you're able to build a native wxWindows
+using configure' and make sure you're able to build a native wxWidgets

 library; cross-compiling errors can be pretty obscure and you'll want to be
 sure that your configure setup is basically sound.)
 
 library; cross-compiling errors can be pretty obscure and you'll want to be
 sure that your configure setup is basically sound.)