Switch to monolithic build because of a dependency problem

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

diff --git a/wxPython/distrib/mac/wxPythonOSX/build b/wxPython/distrib/mac/wxPythonOSX/build
index e46fbeafde8e4388c6aa1d226d9d27a081acda73..f5e5996d43d99405651c799544ca24775d4250fc 100755 (executable)
--- a/wxPython/distrib/mac/wxPythonOSX/build
+++ b/wxPython/distrib/mac/wxPythonOSX/build
@@ -179,7 +179,7 @@ if [ $skipconfig != yes ]; then
     $WXDIR/configure \
        --prefix=$PREFIX \
        --with-mac \
     $WXDIR/configure \
        --prefix=$PREFIX \
        --with-mac \

-       --disable-monolithic \
+       --enable-monolithic \

        --with-opengl \
        --enable-sound \
        --enable-display \
        --with-opengl \
        --enable-sound \
        --enable-display \

diff --git a/wxPython/docs/BUILD.txt b/wxPython/docs/BUILD.txt
index 729fb81e95ee55734bf5a017ab65149f21f5c8ac..df4843acea8eec17e4b673ac55803c53c8874ba2 100644 (file)
--- 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 \
          ../configure --prefix=/opt/wx/2.5 \
                       --with-gtk \
                       --with-opengl \

-                      --disable-monolithic \

                       --enable-debug \
                       --enable-geometry \
                       --enable-sound --with-sdl \
                       --enable-debug \
                       --enable-geometry \
                       --enable-sound --with-sdl \


@@ -87,6 +86,16 @@ place, then do the same for wxPython.
    On OS X of course you'll want to use --with-mac instead of
    --with-gtk.  
 
    On OS X of course you'll want to use --with-mac instead of
    --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 then add::
 
    By default GTK2 will be selected if it is on your build system.  To
    force the use of GTK 1.2.x then add::