Unicode compilation fixes

[wxWidgets.git] / wxPython / BUILD.win32.txt

diff --git a/wxPython/BUILD.win32.txt b/wxPython/BUILD.win32.txt
index 4944ecebe2cb09fe97e82d61df6863e3c2bf280b..748d5c0d0b8fe1ef4370543ccc900ec250f9ca9e 100644 (file)
--- a/wxPython/BUILD.win32.txt
+++ b/wxPython/BUILD.win32.txt
@@ -19,8 +19,10 @@ few bits of background information on tools.
 I use a tool called SWIG (http://www.swig.org) to help generate the
 C++ sources used in the wxPython extension module.  However you don't
 need to have SWIG unless you want to modify the *.i files.  If you do
-you'll want to have version 1.1-883 of SWIG and you'll need to change
-a flag in the setup.py script as described below.
+you'll want to have version 1.1-883 of SWIG and you'll need to apply
+the patches and updates in wxPython/SWIG and rebuild it.  Then you'll
+need to change a flag in the setup.py script as described below so the
+wxPython build process will use SWIG if needed.
 
 I use the new Python Distutils tool to build wxPython.  It is included
 with Python 2.0, but if you want to use Python 1.5.2 or 1.6 then
@@ -55,10 +57,6 @@ B. You'll usually want to use wxWindows sources that have the same
    version number as the wxPython sources you are using.  (Another
    advantage of using CVS is that you'll get both at the same time.)
 
-   NOTE:  There probably isn't going to be an official 2.2.2 release
-   for wxMSW so I have taken a snapshot of my workspace and made it
-   available at http://alldunn.com/wxPython/dist/others/
-
 C. Once you get the sources be sure to put them in a path without a
    space in it (i.e., NOT c:\Program Files\wx) and set an environment
    variable named WXWIN to this directory.  For example:
@@ -80,7 +78,6 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
         wxUSE_NEW_GRID                     1
         wxUSE_GLOBAL_MEMORY_OPERATORS      0
         wxUSE_LIBTIFF                      1
-        wxUSE_GLCANVAS                     1
         wxDIALOG_UNIT_COMPATIBILITY        0
 
     I also turn off the following as they are not currently used in
@@ -93,11 +90,17 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
         wxUSE_DIALUP_MANAGER               0
         wxUSE_DYNLIB_CLASS                 0
         wxUSE_DOC_VIEW_ARCHITECTURE        0
-        wxUSE_MDI_ARCHITECTURE             0
         wxUSE_PLOT                         0
         wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
 
 
+    ** NEW **
+    Be sure that wxUSE_GLCANVAS is defined to be 0 as wxPython now
+    keeps its own copy of the glcanvas sources and expects that it is
+    not in the main library.  This is done to reduce the number of
+    dependant DLLs on the core library and therefore help reduce
+    startup time.
+
 
 
 2. Build the wxWindows DLL
@@ -155,7 +158,7 @@ B. There are three different types of wxWindows DLLs that can be
 C. Change to the wx2\src\msw directory and type the following command,
    using the value for FINAL that you want:
 
-        nmake -f makefile.vc dll pch USE_GLCANVAS=1 FINAL=hybrid
+        nmake -f makefile.vc dll pch FINAL=hybrid
 
    Your machine will then crunch away for possibly a long time,
    depending on your hardware, and when it's done you should have a