X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c2c0629bb53d3e6c99d77b1c07bcdd42427fbe8..7747ff60b89139ca169305fc9be9fe2b54fb2b31:/wxPython/docs/BUILD.txt?ds=inline

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 7d9700ba8c..1b59bc8a69 100644
--- a/wxPython/docs/BUILD.txt
+++ b/wxPython/docs/BUILD.txt
@@ -77,7 +77,6 @@ place, then do the same for wxPython.
          ../configure --prefix=/opt/wx/2.5 \
                       --with-gtk \
                       --with-opengl \
-                      --disable-monolithic \
                       --enable-debug \
                       --enable-geometry \
                       --enable-sound --with-sdl \
@@ -85,9 +84,26 @@ place, then do the same for wxPython.
                       
 
    On OS X of course you'll want to use --with-mac instead of
-   --with-gtk.  For GTK2 and unicode add::
+   --with-gtk.  
+
+   **NOTE**: Due to a recent change there is a dependency problem in the
+   multilib builds of wxWidgets on OSX, so I have switched to a
+   monolithic build on that platform.  (IOW, all of the core code in
+   one shared library instead of several.)  I would also expect other
+   unix builds to do just fine with a monolithic library, but I havn't
+   tested it in a while so your mileage may vary.  Anyway, to switch
+   to the monolithic build of wxWidgets just add this configure flag::
+
+		     --enable-monolithic \
+
+   By default GTK2 will be selected if it is on your build system.  To
+   force the use of GTK 1.2.x add this flag::
+
+		      --disable-gtk2 \
+
+   To make the wxWidgets build be Unicode enabled (strongly
+   recommended if you are building with GTK2) then add::
                          
-                      --enable-gtk2 \
                       --enable-unicode \
 
    Notice that I used a prefix of /opt/wx/2.5.  You can use whatever
@@ -115,7 +131,7 @@ place, then do the same for wxPython.
    command but there are other libraries besides the main wxWidgets
    libs that also need to be built so again I make a script to do it
    all for me so I don't forget anything.  This time it is called
-   ".make" (I use the leading ".  so when I do ``rm -r *`` in my build
+   ".make" (I use the leading "."  so when I do ``rm -r *`` in my build
    dir I don't lose my scripts too.)  This is what it looks like::
 
         make $* \
@@ -168,10 +184,17 @@ place, then do the same for wxPython.
 
          WX_CONFIG=/opt/wx/2.5/bin/wx-config
 
-   If you are building with GTK2 then add the following flags to the
-   command line::
+   By default setup.py will assume that you built wxWidgets to use
+   GTK2.  If you built wxWidgets to use GTK 1.2.x then you should add
+   this flag to the command-line::
+
+	 WXPORT=gtk 
 
-         WXPORT=gtk2 UNICODE=1
+   If you would like to do a Unicode enabled build (all strings sent
+   to or retruned from wx functions are Unicode objects) and your
+   wxWidgets was built with unicode enabled then add this flag::
+
+         UNICODE=1
 
    If you are wanting to have the source files regenerated with swig,
    then you need to turn on the USE_SWIG flag and optionally tell it