compilation fix after TRUE/FALSE change

[wxWidgets.git] / docs / msw / install.txt

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index a9d40c714a78ebf60ea05fb8da66a7e30a321d75..9663cd19b5bc4dc73d42a559ab0f721464d4d486 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -1,16 +1,19 @@
 
 

-Installing wxWindows 2.1
-------------------------
+Installing wxWindows 2.3.3
+--------------------------
+
+This is wxWindows 2.3.3 for Microsoft Windows 9x/ME, Windows NT,
+Windows 2000 and Windows XP. This is an unstable development release.

 
 

-This is a beta release of wxWindows 2.1 for Microsoft
-Windows 95, 98 and NT. This is not a production release,
-although a huge number of bugs found in wxWindows 2.0 have been
-fixed.
+Please note that the library naming conventions for VC++
+compilation have changed after 2.3.1. This means that
+you will need to change your application project files. See the
+relevant section below for details.

 
 IMPORTANT NOTE: If you experience problems installing, please
 
 IMPORTANT NOTE: If you experience problems installing, please

-re-read this instructions and other related files (release.txt,
-todo.txt, bugs.txt etc.) carefully before mailing wxwin-users or
-the author. Preferably, try to fix the problem first and
+re-read this instructions and other related files (changes.txt,
+readme.txt, notes on the Web site) carefully before mailing
+wx-users or the author. Preferably, try to fix the problem first and

 then send a patch to the author. Please report bugs using the
 bug report form on the wxWindows web site.
 
 then send a patch to the author. Please report bugs using the
 bug report form on the wxWindows web site.
 


@@ -29,33 +32,20 @@ program contains the following:
 - makefiles for most Windows compilers, plus BC++ and
   VC++ IDE files;
 - JPEG library source;
 - makefiles for most Windows compilers, plus BC++ and
   VC++ IDE files;
 - JPEG library source;

+- TIFF library source;

 - Object Graphics Library;
 - Object Graphics Library;

-- wxGLCanvas library;
-- wxTreeLayout library;

 - Tex2RTF source;
 - Dialog Editor binary.
 
 - Tex2RTF source;
 - Dialog Editor binary.
 

-Alternatively, you may unarchive the set of .zip files by hand,
-where x is the minor version number and y is the release number:
-
-wx2_x_y_gen.zip            Generic source code and samples (required)
-wx2_x_y_msw.zip            Windows-specific source code and samples (required)
-wx2_x_y_doc.zip            Documentation source code (not required)
-wx2_x_y_hlp.zip            WinHelp documentation
-wx2_x_y_pdf.zip            Acrobat PDF documentation
-wx2_x_y_htm.zip            HTML documentation
-wx2_x_y_vc.zip             MS VC++ 5.0 project files
-wx2_x_y_cw.zip             Metrowerks CodeWarrior project files
-wx2_x_y_bc.zip             BC++ 5 project files
-jpeg.zip                   Use this to allow wxImage to read and write JPEG files
-tiff.zip                   Use this to allow wxImage to read and write TIFF files
+Alternatively, you may unarchive the .zip form by hand:
+wxMSW-x.y.z.zip where x.y.z is the version number.

 
 Unarchive the required files plus any optional documentation
 files into a suitable directory such as c:\wx.
 
 Other add-on packages are available from the wxWindows Web site, such as:
 
 
 Unarchive the required files plus any optional documentation
 files into a suitable directory such as c:\wx.
 
 Other add-on packages are available from the wxWindows Web site, such as:
 

-- glcanvas.zip. Use OpenGL in a wxWindows window.
+- mmedia.zip. Audio, CD, video access for Windows and Linux.

 - ogl3.zip. Object Graphics Library: build network diagrams, CASE tools etc.
 - tex2rtf3.zip. Tex2RTF: create Windows Help, HTML, and Word RTF files from
   the same document source.
 - ogl3.zip. Object Graphics Library: build network diagrams, CASE tools etc.
 - tex2rtf3.zip. Tex2RTF: create Windows Help, HTML, and Word RTF files from
   the same document source.


@@ -68,8 +58,8 @@ For Cygwin or Mingw32 compilation, make sure WXWIN contains only
 forward slashes.
 
 If installing from the CVS server, copy include/wx/msw/setup0.h to
 forward slashes.
 
 If installing from the CVS server, copy include/wx/msw/setup0.h to

-include/wx/msw/setup.h and edit the resulting file to choose the featrues you
-would like to compile wxWindows with[out].
+include/wx/msw/setup.h and edit the resulting file to choose
+the features you would like to compile wxWindows with[out].

 
 Compilation
 -----------
 
 Compilation
 -----------


@@ -77,27 +67,38 @@ Compilation
 The following sections explain how to compile wxWindows with each supported
 compiler.
 
 The following sections explain how to compile wxWindows with each supported
 compiler.
 

-Visual C++ 4.0/5.0/6.0 compilation
-----------------------------------
+Visual C++ 6.0 compilation
+---------------------------

 
 

-Using project files:
-
-1. Unarchive wx2_x_y_vc.zip, the VC++ 5/6 project makefiles.
-2. Open src/wxvc.dsp, set Debug or Release configuration, and
-   compile. This will produce src/Debug/wxvc.lib or
-   src/Release/wxvc.lib.  The project file src/wxvc_dll.dsp
-   will make a DLL version of wxWindow, which will go in
-   src/DebugDLL/wxvc.[lib,dll] and src/ReleaseDLL/wxvc.[lib,dll].
-3. If you want to use JPEG in your application (such as the image
-   sample), open src/jpeg/jpeg.dsp (VC++ 5/6 only) and compile in
-   Debug and Release configurations. If you have VC++ 4,
-   use makefile.vc, but you may only have one set of object
-   files at a time in use (debug or release versions).
-4. Similarly for TIFF: use src/tiff/tiff.dsp.
-5. Open a sample project file, choose a configuration using
-   Build | Set Active Configuration..., and compile.
-   The project files don't use precompiled headers, to save
+Using project files (VC++ 6 only):
+
+1. Unarchive wxWindows-x.y.z-vc.zip, the VC++ 6 project
+   makefiles (already included in wxMSW-x.y.z.zip and the setup version).
+2. Open src/wxWindows.dsp, which has configurations for static
+   compilation or DLL compilation, and each of these available in
+   Unicode/ANSI and Debug/Release variations. Normally you'll use
+   a static linking ANSI configuration. Choose the Win32 Debug or
+   Win32 Release configuration for the wxWindows project, and compile.
+   Alternatively, use Batch Build to build more than one
+   configuration.
+   The following libraries will be produced depending on chosen
+   configuration:
+
+   wxmsw.lib     wxmswd.lib      ; ANSI Release/Debug
+   wxmswu.lib    wxmswud.lib     ; UNICODE Release/Debug
+   wxmsw23x.lib  wxmsw23xd.lib   ; ANSI DLL Release/Debug
+   wxmsw23xu.lib wxmsw23xud.lib  ; UNICODE DLL Release/Debug
+
+   It will also produce similar variations on jpeg.lib, png.lib,
+   tiff.lib, zlib.lib, and regex.lib.
+3. Open a sample project file, choose a configuration such as
+   Win32 Debug using Build | Set Active Configuration..., and compile.
+   The project files don't use precompiled headers, to save disk

    space, but you can switch PCH compiling on for greater speed.
    space, but you can switch PCH compiling on for greater speed.

+   NOTE: you may also use samples/samples.dsw to access all
+   sample projects without opening each workspace individually.
+   You can use the Batch Build facility to make several samples
+   at a time.

 
 Using makefiles:
 
 
 Using makefiles:
 


@@ -111,39 +112,43 @@ Using makefiles:
   'nmake -f makefile.vc'
 
    to make the wxWindows core library with debug information
   'nmake -f makefile.vc'
 
    to make the wxWindows core library with debug information

-   (wx\lib\wx_d.lib), or
+   (wx\lib\wxd.lib), then

 
 

+  'nmake -f makefile.vc cleanall FINAL=1'

   'nmake -f makefile.vc FINAL=1'
 
   'nmake -f makefile.vc FINAL=1'
 

-   to make the wxWindows core library without debug information
-   (wx\lib\wx.lib).
+   to make the wxWindows core library without debug information.

 4. Change directory to wx\samples and type 'nmake -f makefile.vc'
    to make all the samples. You can also make them individually.
 
 4. Change directory to wx\samples and type 'nmake -f makefile.vc'
    to make all the samples. You can also make them individually.
 

-Notes:
+Makefile notes:

 
 

-  Use the 'clean' target to clean all objects, libraries and
+  Use the 'cleanall' target to clean all objects, libraries and

   executables.
 
   To build the release version using makefiles, add FINAL=1 to your
   nmake invocation, both when building the library and for samples.
   executables.
 
   To build the release version using makefiles, add FINAL=1 to your
   nmake invocation, both when building the library and for samples.

+  You MUST use the 'cleanall' target (with FINAL=1 or FINAL=0)
+  before making a different configuration, because otherwise
+  object files used to build the previous configuration may be
+  used accidentally for the current configuation. You might see
+  this manifested in unexpected link errors or warnings. This problem
+  doesn't occur when using project files to build wxWindows.
+
+  To build Unicode versions of the libraries, add UNICODE=1
+  to the nmake invocation ( default is UNICODE=0 ).

 
   Note that the wxWindows core library allows you to have debug
   and release libraries available simultaneously, by compiling the
   objects in different subdirectories, whereas samples must be
 
   Note that the wxWindows core library allows you to have debug
   and release libraries available simultaneously, by compiling the
   objects in different subdirectories, whereas samples must be

-  cleaned and re-made to build a different configuration. This
-  may be changed in later versions of wxWindows.
+  cleaned and re-made to build a different configuration.

 
 To build the DLL version using makefiles:
 
 1. Change directory to wx\src\msw. Type 'nmake -f makefile.vc dll pch'
    to make both a suitable DLL and import library, and to build a
    suitable precompiled header file for compiling applications.
 
 To build the DLL version using makefiles:
 
 1. Change directory to wx\src\msw. Type 'nmake -f makefile.vc dll pch'
    to make both a suitable DLL and import library, and to build a
    suitable precompiled header file for compiling applications.

-   The resulting libraries are called:
-
-      wx\lib\wx200.lib(dll) (debug version)
-      wx\lib\wx200.lib(dll)   (release version, using FINAL=1)
-
+   See the previous section for library names.

 2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
    (or edit src\makeprog.vc to set WXUSINGDLL to 1 for all
    applications).
 2. Invoke a sample makefile with 'nmake -f makefile.vc WXUSINGDLL=1'
    (or edit src\makeprog.vc to set WXUSINGDLL to 1 for all
    applications).


@@ -157,8 +162,9 @@ using templates, to avoid the non-template stream files being included
 within wxWindows.
 
 Note (2): libraries and applications generated with makefiles and
 within wxWindows.
 
 Note (2): libraries and applications generated with makefiles and

-project files are unlikely to be compatible, so use one method or
-the other.
+project files are now (hopefully) compatible where static libraries
+are concerned, but please exercise caution nevertheless and if
+possible, use one method or the other.

 
 Note (3): VC++ 5's optimization code seems to be broken and can
 cause both compile and run-time problems: this can be seen when
 
 Note (3): VC++ 5's optimization code seems to be broken and can
 cause both compile and run-time problems: this can be seen when


@@ -170,15 +176,6 @@ optimized. For example, in wxWindows project, set to 'Minimum
 Size'. In Dialog Editor project, set to 'Customize: Favor Small
 Code' (and no others). This will then work.
 
 Size'. In Dialog Editor project, set to 'Customize: Favor Small
 Code' (and no others). This will then work.
 

-Similarly, in VC++ 4, optimization can cause internal compiler
-errors, so edit src\makevc.env and change /O1 to /Od before
-trying build a release version of the library. Or, type:
-
-nmake -f makefile.vc noopt FINAL=1
-
-and then resume compilation in the normal way. This will build
-troublesome files with no optimization.
-

 Note (4): some crash problems can be due to inconsistent compiler
 options. If strange/weird/impossible things start to happen please
 check (dumping IDE project file as makefile and doing text comparison
 Note (4): some crash problems can be due to inconsistent compiler
 options. If strange/weird/impossible things start to happen please
 check (dumping IDE project file as makefile and doing text comparison


@@ -186,9 +183,18 @@ if necessary) that the project settings, especially the list of defined
 symbols, struct packing, etc. are exactly the same for all items in
 the project. After this, delete everything (including PCH) and recompile.
 
 symbols, struct packing, etc. are exactly the same for all items in
 the project. After this, delete everything (including PCH) and recompile.
 

+Note (5): to create your own IDE files, see the technical note on the
+wxWindows web site or CD-ROM, entitled "Compiling wxWindows
+applications in the VC++ IDE" (technical note docs/tech/tn0010.htm in the
+wxWindows distribution). You can also copy .dsp and .dsw
+files from an existing wxWindows sample and adapt them.
+

 Visual C++ 1.5 compilation (16-bit)
 -----------------------------------
 
 Visual C++ 1.5 compilation (16-bit)
 -----------------------------------
 

+NOTE: this has not been tested recently and probably doesn't
+work.
+

 1. Make sure your WXWIN variable is set, and uses the FAT (short
    name) form.
 2. Change directory to wx\src\msw. Type 'nmake -f makefile.dos' to
 1. Make sure your WXWIN variable is set, and uses the FAT (short
    name) form.
 2. Change directory to wx\src\msw. Type 'nmake -f makefile.dos' to


@@ -202,22 +208,39 @@ versions of the library and samples.
 Use the 'clean' target to clean all objects, libraries and
 executables.
 
 Use the 'clean' target to clean all objects, libraries and
 executables.
 

-Borland C++ 4.5/5.0 compilation
+Borland C++ 4.5/5.0/5.5 compilation

 -------------------------------
 
 Compiling using the makefiles:
 
 -------------------------------
 
 Compiling using the makefiles:
 

-1. Make sure your WXWIN variable is set, and uses the FAT (short
-   name) form if doing a 16-bit compile.
-2. Change directory to wx\src\msw. Type 'make -f makefile.b32' to
+0. If downloading from CVS, copy include\wx\msw\setup0.h to
+   include\wx\setup.h.
+1. Make sure your WXWIN variable is set [e.g add
+   set WXWIN=c:\wxwindows
+   to your autoexec.bat file], and that it uses the FAT (short
+   name) form with no spaces.
+   Make sure your BCCDIR variable is set [e.g add
+   set BCCDIR=c:\progra~1\borland\bcc
+   to your autoexec.bat file], and that it points to the root directory of 
+   your Borland C++ installation, and it uses the FAT (short
+   name) form with no spaces.
+   Reboot if needed for the changes to autoexec.bat to take effect.   
+2. Change directory to src\msw. Type 'make -f makefile.b32' to

    make the wxWindows core library. Ignore the warnings about
    'XXX' not found in library.
    make the wxWindows core library. Ignore the warnings about
    'XXX' not found in library.

-3. Change directory to a sample such as minimal, and type
+3. Change directory to a sample or demo such as samples\minimal, and type

   'make -f makefile.b32'.
 4. For release versions, recompile wxWindows and samples using
    'make -f makefile.b32 clean'
    'make -f makefile.b32 FINAL=1'
    for the library and samples.
   'make -f makefile.b32'.
 4. For release versions, recompile wxWindows and samples using
    'make -f makefile.b32 clean'
    'make -f makefile.b32 FINAL=1'
    for the library and samples.

+5. To make and use wxWindows as a DLL, type
+   'make -f makefile.b32 clean'
+   'make -f makefile.b32 DLL=1'
+   and then for each sample,
+   'make -f makefile.b32 WXUSINGDLL=1'
+   Please note that the samples have not been exhaustively tested
+   with this configuration.

 
 Note (1): the wxWindows library and (some) samples compile in 16-bit mode
 using makefile.bcc, but at present the wxWindows resource system is switched
 
 Note (1): the wxWindows library and (some) samples compile in 16-bit mode
 using makefile.bcc, but at present the wxWindows resource system is switched


@@ -240,12 +263,16 @@ recompile wxWindows. The same applies if compiling using the IDE.
 
 Note (5): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder;
 you will therefore need to set wxUSE_LIBJPEG to 0 in setup.h and remove
 
 Note (5): BC++ 4.5 (not 5.0) trips up over jdmerge.c in the JPEG folder;
 you will therefore need to set wxUSE_LIBJPEG to 0 in setup.h and remove

-the jpeg target from src\msw\makefile.b32.
+the jpeg target from src\msw\makefile.b32, and remove jpeg from
+src\makeprog.b32.
+
+Note (6): [obsolete]

 
 

-Note (6): If using C++Builder 4 and above (BC++ 5.4), change LINK=tlink32 to
-LINK=ilink32 in src\makeb32.env.
+Note (7): If you wish debug messages to be sent to the console in
+debug mode, edit src\makeb32.env and change /aa to /Tpe in
+LINK_FLAGS.

 
 

-Compiling using the IDE files:
+Compiling using the IDE files: [Borland C++ 5.0, not Cbuilder]

 
 1. Load src\bc32.ide (Release settings)
 2. Go to Options|Project... and specify the correct BC++ include and lib path for
 
 1. Load src\bc32.ide (Release settings)
 2. Go to Options|Project... and specify the correct BC++ include and lib path for


@@ -260,58 +287,72 @@ Compiling using the IDE files:
    since some (notably the wxHTML samples) look for files
    relative to the working directory.
 
    since some (notably the wxHTML samples) look for files
    relative to the working directory.
 

-Note that to make the png, xpm, zlib and jpeg libraries (needed for
+Note (1): the samples project file contains a selection of
+samples, and not all samples. The remaining samples can be made
+with the makefiles. See also the demos hierarchy which doesn't
+have any BC++ project files yet.
+
+Note (2): to make the png, zlib, jpeg and tiff libraries (needed for

 some samples) you need to compile them with bc32.ide.
 
 some samples) you need to compile them with bc32.ide.
 

-The debug version of the wxWindows library is about 37 MB, and the
-release version is around 3 MB.
+Note (3): the debug version of the wxWindows library is about 40 MB, and the
+release version is around 5 MB.

 
 

-See also the file bc_ide.txt for further instructions and details
+See also the file docs/tech/tn0007.txt for further instructions and details

 of how to create your own project files.
 
 of how to create your own project files.
 

-Borland C++Builder compilation
+** REMEMBER **
+
+In all of your wxWindows applications, your source code should include 
+the following preprocessor directive:
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+(check the samples -- e.g., \wx2\samples\minimal\minimal.cpp -- for 
+more details) 
+
+Borland C++Builder IDE compilation

 ------------------------------
 
 ------------------------------
 

-C++Builder compilation is the same as for Borland C++ above.
+1. Build the wxWindows libraries using the Borland make utility as
+   specified in the section called "Borland C++ 4.5/5.0 compilation"
+   above. (C++ Builder includes a stand-alone C++ compiler.  For example,
+   C++ Builder 4.0 comes with C++ 5.4.)

 
 

-Tested with C++Builder 1.0 and 3.0. Only makefiles are currently
-supplied.
+2. You can build samples using the makefiles as per the
+   instructions for BC++ above, or you can follow the instructions
+   in docs/tech/tn0004.htm or http://biolpc22.york.ac.uk/wx/bc/ide.html.
+   You can use the process_sample_bcb.bat command which is in
+   wxwindows\distrib\msw to generate a .mak or .bpr file for most of the
+   samples [mak for Cbuilder 1-3; bpr for v4]. Execute this in the sample
+   directory, passing the name of the cpp files on the command line.

 
 Watcom C++ 10.6/11 compilation
 ---------------------------
 
 1. Make sure your WXWIN variable is set, and uses the DOS short
    name form.
 
 Watcom C++ 10.6/11 compilation
 ---------------------------
 
 1. Make sure your WXWIN variable is set, and uses the DOS short
    name form.

-2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat' to
+2. Change directory to wx\src\msw. Type 'wmake -f makefile.wat all' to

    make the wxWindows core library.
    make the wxWindows core library.

-3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat'
+3. Change directory to wx\samples\minimal and type 'wmake -f makefile.wat all'

    to make this sample. Repeat for other samples of interest.
 
    to make this sample. Repeat for other samples of interest.
 

-Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
-imagjpeg.cpp doesn't compile.
-Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
+Note (1): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom

 directory. See the notes in that directory.
 directory. See the notes in that directory.

-Note (3): if variant.cpp is compiled with date/time class
+Note (2): if variant.cpp is compiled with date/time class

 options, the linker gives up. So the date/time option is switched
 off for Watcom C++. Also, wxAutomationObject is not compiled with
 Watcom C++.
 options, the linker gives up. So the date/time option is switched
 off for Watcom C++. Also, wxAutomationObject is not compiled with
 Watcom C++.

-Note (4): if Watcom can't read the precompiled header when
+Note (3): if Watcom can't read the precompiled header when

 building a sample, try deleting src\msw\watcom.pch and
 compiling the sample again.
 building a sample, try deleting src\msw\watcom.pch and
 compiling the sample again.

-Note (5): if you get _popen_ and _pclose_ link errors, try
-recompiling wxWindows with XPM support disabled in setup.h.
-Alternatively, make sure these lines exist at the top of
-src\xpm\xpmi.h:
-
-// Added by JACS for Watcom C++/wxWindows compilation (no popen/pclose functions)
-#ifdef __WATCOMC__
-#define NO_ZPIPE
-#endif

 
 Metrowerks CodeWarrior compilation
 ----------------------------------
 
 
 Metrowerks CodeWarrior compilation
 ----------------------------------
 

-1. Downloaded and unzip wx2_x_y_cw.zip.
+1. Downloaded and unzip wxWindows-x.y.z-cw.zip.

 2. Load the make_cw.mcp project in wx\src, and compile.
 3. Load the make_cw.mcp project in wx\samples\minimal, and compile.
    Further project files for samples will be available in due
 2. Load the make_cw.mcp project in wx\src, and compile.
 3. Load the make_cw.mcp project in wx\samples\minimal, and compile.
    Further project files for samples will be available in due


@@ -360,75 +401,78 @@ the debugging version of the library is 90MB, with samples coming in
 at 40MB :-) However, wxWindows at least makes a good test suite for
 improving the compiler.
 
 at 40MB :-) However, wxWindows at least makes a good test suite for
 improving the compiler.
 

-Cygwin b19/b20/Mingw32 compilation
+Cygwin/Mingw32 compilation

 ----------------------------------
 
 ----------------------------------
 

-wxWindows 2 supports Cygwin (formerly GnuWin32) b19, b20, Mingw32, and Mingw32/EGCS.
+wxWindows 2 supports Cygwin (formerly GnuWin32) betas and
+releases, and Mingw32.

 
 

-Thanks are due to Keith Garry Boyce (garp@opustel.com) and Cygnus for making
-it all possible.
+Thanks are due to Keith Garry Boyce (garp@opustel.com), Cygnus
+and others for making it all possible.

 
 

-From wxWindows 2.0 beta 9, both Cygwin and Mingw32 (the minimal
-distribution of Cygwin) can be used with the same makefiles.
+Both Cygwin and MinGW can be used with the same makefiles.
+
+NOTE: some notes specific to old Cygwin ( < 1.1.x )
+      and MinGW ( < 1.0 ) are at the end of this section
+      ( see OLD VERSIONS )

 
 Here are the steps required:
 
 
 Here are the steps required:
 

-- Retrieve and install the latest beta of Cygwin, or Mingw32, as per the
+- Retrieve and install the latest version of Cygwin, or Mingw32, as per the

   instructions with either of these packages.
 
   instructions with either of these packages.
 

-- If using Mingw32 (including the EGCS variant), you need some
-  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
-  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 with wxWindows 2.1 or above, and wish to use OLE, you
-  should hand-patch in Mingw32-gcc295.patches (located in the top-level of the
-  wxWindows 2 installation).
-
-- Modify the file wx/src/cygnus.bat (or mingw32.bat or mingegcs.bat)
-  to set up appropriate variables, if necessary mounting drives.
-  Run it before compiling.
-
-- For Cygwin, make sure there's a \tmp directory on your
-  Windows drive or bison will crash.
-
-- 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.
+- If using Mingw32, you need some extra files to use the wxWindows
+  makefiles. You can find these files in ports/mingw32 on the
+  wxWindows ftp site or CD-ROM, as extra.zip. 

 
 

-- Mingw32 may not support winsock.h, so if you have a problem
-  here, comment out socket-related files in src/msw/makefile.g95.
+  ftp://ftp.remstar.com/pub/wxwin/ports/mingw32/extra.zip
+  
+  These should be extracted to the Mingw32 directory. If you have 
+  already downloaded rm, cp, mv from elsewhere, you won't need this.

 
 - Set your WXWIN variable to where wxWindows is installed.
   *** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
   backslashes.
 
 - Use the makefile.g95 files for compiling wxWindows and samples,
 
 - Set your WXWIN variable to where wxWindows is installed.
   *** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
   backslashes.
 
 - Use the makefile.g95 files for compiling wxWindows and samples,

-  e.g.:
+  e.g. to compile a debugging version of wxWindows:

   > cd c:\wx\src\msw
   > make -f makefile.g95
   > cd c:\wx\samples\minimal
   > make -f makefile.g95
 
   > cd c:\wx\src\msw
   > make -f makefile.g95
   > cd c:\wx\samples\minimal
   > make -f makefile.g95
 

+  to compile with optimizations:
+  > cd c:\wx\src\msw
+  > make -f makefile.g95 FINAL=1
+  > cd c:\wx\samples\minimal
+  > make -f makefile.g95 FINAL=1
+
+  to compile a DLL:
+  > cd c:\wx\src\msw
+  > make -f makefile.g95 WXMAKINGDLL=1
+  > cd c:\wx\samples\minimal
+  > make -f makefile.g95 WXUSINGDLL=1
+
+  to compile the Unicode version:
+  > cd c:\wx\src\msw
+  > make -f makefile.g95 UNICODE=1
+  > cd c:\wx\samples\minimal
+  > make -f makefile.g95 UNICODE=1
+
+  Options can be combined ( e.g.: UNICODE=1 FINAL=1 )
+

   Ignore the warning about the default entry point.
 
 - Use the 'strip' command to reduce executable size.
 
   Ignore the warning about the default entry point.
 
 - Use the 'strip' command to reduce executable size.
 

-- With Cygnus Cygwin, you can invoke gdb --nw myfile.exe to
+- With Cygwin, you can invoke gdb --nw myfile.exe to

   debug an executable. If there are memory leaks, they will be
   debug an executable. If there are memory leaks, they will be

-  flagged when the program quits.
-
-- If using GnuWin32 b18, you will need to copy windres.exe
-  from e.g. the Mingw32 distribution, to a directory in your path.
+  flagged when the program quits. You can use Cygwin gdb
+  to debug MinGW executables.

 
 All targets have 'clean' targets to allow removal of object files
 
 All targets have 'clean' targets to allow removal of object files

-and other intermediate compiler files.
+and other intermediate compiler files and 'cleanall' targets to
+allow removal of all object files and library files.

 
 Notes:
 
 
 Notes:
 


@@ -450,20 +494,56 @@ Notes:
 
    (a missing bracket).
 
 
    (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
    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.
 
 
 5. If there's a problem executing the windres program, try
    commenting out RCPREPROCESSOR in makeg95.env.
 

+6. OpenGL support should work with Mingw32 as-is. However,
+   if you wish to generate import libraries appropriate either for
+   the MS OpenGL libraries or the SGI OpenGL libraries, go to
+   include/wx/msw/gl and use:
+
+     dlltool -k -d opengl.def -llibopengl.a
+
+   for the SGI DLLs, or
+
+     dlltool -k -d opengl32.def -llibopengl32.a
+
+   and similarly for glu[32].def.
+
+OLD VERSIONS:
+
+- If using Mingw32 2.95 and below with wxWindows 2.1 or above, you
+  must hand-patch with Mingw32-gcc295.patches (located in the
+  top-level of the wxWindows 2 installation). Mingw32 2.95.2
+  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.
+  Run it before compiling.
+
+- For Cygwin, make sure there's a \tmp directory on your
+  Windows drive or bison will crash (actually you don't need
+  bison for ordinary wxWindows compilation: a pre-generated .c file is
+  supplied).
+
+- Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
+  the file to either 1 (you have Mingw32 or Cygwin 1.x releases) or 0
+  (if you have Cygwin betas). If using Mingw32, also set the
+  MINGW32VERSION variable appropriately.
+
+- If using GnuWin32 b18, you will need to copy windres.exe
+  from e.g. the Mingw32 distribution, to a directory in your path.
+

 References:
 
 References:
 

- - The GNU-WIN32 site is at
-     http://www.cygnus.com/gnu-win32/
+ - The Cygwin site is at
+     http://sources.redhat.com/cygwin

  - Mingw32 is available at:
  - Mingw32 is available at:

-     ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
- - See also http://web.ukonline.co.uk/julian.smart/wxwin/gnuwin32.htm
+     ftp://www.mingw.org

 
 TWIN32 and gcc on Linux
 -----------------------
 
 TWIN32 and gcc on Linux
 -----------------------


@@ -484,17 +564,14 @@ General Notes
 -------------
 
 - Debugging: under Windows 95, debugging output isn't output in
 -------------
 
 - Debugging: under Windows 95, debugging output isn't output in

-  the same way that it is under NT or Windows 3.1. Set
-  wxUSE_DBWIN32 to 1 if you wish to enable code to output debugging
-  info to an external debug monitor, such as Andrew Tucker's DBWIN32.
-  You can download DBWIN32 from:
-
-        http://ftp.digital.com/pub/micro/NT/WinSite/programr/dbwin32.zip
-
-  and it's also on the wxWindows CD-ROM under Packages.
+  the same way that it is under NT or Windows 3.1.
+  Please see DebugView (bin/dbgview.exe in the distribution), also
+  available from http://www.sysinternals.com and on the wxWindows CD-ROM
+  under Packages.

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