Added MS VC++ instructions.

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

diff --git a/BuildCVS.txt b/BuildCVS.txt
index 20fd09d6bfccf0fb9543fe830fac9987929ab13b..4668a0bc8e48e1e7574e096c463e2db9db8d2e4c 100644 (file)
--- a/BuildCVS.txt
+++ b/BuildCVS.txt
@@ -5,15 +5,26 @@
 I) Windows using plain makefiles
 ----------------------------------------
 
 I) Windows using plain makefiles
 ----------------------------------------
 

-a) Using the GNU MinGW32 or GNU CygWin32 compilers
+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
+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.
+
+Continue with item c) below.
+
+
+b) If using the GNU MinGW32 or GNU CygWin32 compilers

 
 You'll need the compiler itself which is available from
 
   http://www.cygwin.com
 
 
 You'll need the compiler itself which is available from
 
   http://www.cygwin.com
 

-When using MingW32 you'll need GNU make which is part of
-part of the CygWin32 toolchain and is also available as
-a stand alone port without the infamous Cygwin.dll from
+When using MingW32 you'll need GNU make which is a part
+of the CygWin32 toolchain and is also available as a stand
+alone port without the infamous Cygwin.dll from

 
   http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32
 
 
   http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32
 


@@ -23,9 +34,13 @@ and its make.exe).
 
 -> 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

--> Assume that you installed the wxWindows sources
+
+
+c) Build instructions
+
+-> Assumming that you installed the wxWindows sources

    into c:\wxWin
    into c:\wxWin

--> Copy c:\wxWin\include\wx\msw\setup0.h 
+-> 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
    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


@@ -44,7 +59,9 @@ and its make.exe).
    and iostreams ares disabled with
    #define wxUSE_STD_IOSTREAM   0
 -> type: cd c:\wxWin\src\msw
    and iostreams ares disabled with
    #define wxUSE_STD_IOSTREAM   0
 -> type: cd c:\wxWin\src\msw

--> type: make -f makefile.g95
+-> type: make -f makefile.g95 (if using GNU tools)
+or type: make -f makefile.vc  (if using MS VC++)
+

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


@@ -52,7 +69,13 @@ II) Unix ports
 Building wxGTK or wxMotif completely without configure
 won't ever work, but there is now a new makefile system
 that works without libtool and automake, using only
 Building wxGTK or wxMotif completely without configure
 won't ever work, but there is now a new makefile system
 that works without libtool and automake, using only

-configure to create what is needed. 
+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
+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).

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


@@ -78,11 +101,11 @@ III) Windows using configure
 
 Take a look at Unix->Windows cross compiling. With minor
 modifications, this should work in Windows if you've got the cygnus
 
 Take a look at Unix->Windows cross compiling. With minor
 modifications, this should work in Windows if you've got the cygnus

-utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed. 
+utilities (bash, GNU make, etc) and either mingw32 or cygwin32 installed.

 See http://www.cygnus.com for these programs, or go straight to their
 See http://www.cygnus.com for these programs, or go straight to their

-ftp server at ftp://sourceware.cygnus.com/pub/cygwin/. 
+ftp server at ftp://sourceware.cygnus.com/pub/cygwin/.

 
 

-Of course, you can also build the library using plain makefiles (see 
+Of course, you can also build the library using plain makefiles (see

 section I).
 
 V) MacOS
 section I).
 
 V) MacOS


@@ -96,7 +119,7 @@ VII) Unix->Windows cross-compiling using configure
 
 First you'll need a cross-compiler; linux glibc binaries of mingw32 and
 cygwin32 (both based on egcs) can be found at
 
 First you'll need a cross-compiler; linux glibc binaries of mingw32 and
 cygwin32 (both based on egcs) can be found at

-ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Otherwise you can 
+ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Otherwise you can

 compile one yourself. Check the relevant FAQs.
 
 [ A Note about cygwin32 and mingw32: the main difference is that cygwin32
 compile one yourself. Check the relevant FAQs.
 
 [ A Note about cygwin32 and mingw32: the main difference is that cygwin32


@@ -114,15 +137,15 @@ library; cross-compiling errors can be pretty obscure and you'll want to be
 sure that your configure setup is basically sound.)
 
 To cross compile the windows library, do
 sure that your configure setup is basically sound.)
 
 To cross compile the windows library, do

--> cd win32 
+-> cd win32

 (or whatever you called it)
 Now run configure. There are two ways to do this
 -> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
    --enable-dnd=no
 where --build= should read whatever platform you're building on. Configure
 will notice that build and host platforms differ, and automatically prepend
 (or whatever you called it)
 Now run configure. There are two ways to do this
 -> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw \
    --enable-dnd=no
 where --build= should read whatever platform you're building on. Configure
 will notice that build and host platforms differ, and automatically prepend

-i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!). 
-The other way to run configure is by specifying the names of the binaries 
+i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
+The other way to run configure is by specifying the names of the binaries

 yourself:
 -> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
    DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
 yourself:
 -> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
    DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \


@@ -131,18 +154,18 @@ yourself:
 (all assuming you're using mingw32)
 Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
 
 (all assuming you're using mingw32)
 Drag'n'drop is disabled because mingw32 lacks (AFAIK) OLE headers.
 

-[ Update: some new mingw32 versions now have a new set of windows header 
+[ Update: some new mingw32 versions now have a new set of windows header

 files, which apparently can handle ole. Untested at the moment ]
 
 Configure will conclude that shared libraries are out of the question and
 opt for a static one. I haven't looked into DLL creation yet.
 
 files, which apparently can handle ole. Untested at the moment ]
 
 Configure will conclude that shared libraries are out of the question and
 opt for a static one. I haven't looked into DLL creation yet.
 

-Type 
+Type

 -> make
 and wait, wait, wait. Don't leave the room, because the minute you do there
 will be a compile error :-)
 
 -> make
 and wait, wait, wait. Don't leave the room, because the minute you do there
 will be a compile error :-)
 

-If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try 
+If this is successful, you end up with a libwx_msw.a in win32/lib.  Now try

 building the minimal sample:
 
 -> cd samples/minimal
 building the minimal sample:
 
 -> cd samples/minimal


@@ -155,13 +178,13 @@ and run it with wine, for example
 If all is well, do an install; from win32
 -> make install
 
 If all is well, do an install; from win32
 -> make install
 

-Native and cross-compiled installations can co-exist peacefully 
-(as long as their widget sets differ), except for wx-config. You might 
+Native and cross-compiled installations can co-exist peacefully
+(as long as their widget sets differ), except for wx-config. You might

 want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
 
 Cross-compiling TODO:
 ---------------------
 want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
 
 Cross-compiling TODO:
 ---------------------

-- resource compiling must be done manually for now (should/can we link the 
+- resource compiling must be done manually for now (should/can we link the

 default wx resources into libwx_msw.a?) [ No we can't; the linker won't
 link it in... you have to supply an object file ]
 - dynamic libraries
 default wx resources into libwx_msw.a?) [ No we can't; the linker won't
 link it in... you have to supply an object file ]
 - dynamic libraries