Another distrib fix

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

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 389d41a7fe65de1f7447629b60c2b48a5fcd10fb..f0148d1dddf0d3f6f085dcd98aae73005d6fe826 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -28,7 +28,7 @@ on.
 """
 
 
 """
 
 

-BUILD_GLCANVAS = 1 # If true, build the contrib/glcanvas extension module
+BUILD_GLCANVAS = 0 #1 # If true, build the contrib/glcanvas extension module

 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system
 BUILD_OGL = 1      # If true, build the contrib/ogl extension module
 BUILD_STC = 1      # If true, build the contrib/stc extension module
 BUILD_XRC = 1      # XML based resource system


@@ -40,7 +40,7 @@ BUILD_IEWIN = 0    # Internet Explorer wrapper (experimental)
 CORE_ONLY = 0      # if true, don't build any of the above
 
 
 CORE_ONLY = 0      # if true, don't build any of the above
 
 

-GL_ONLY = 0        # Only used when making the -gl RPM.  See the "b" script
+GL_ONLY = 0 #1 #0        # Only used when making the -gl RPM.  See the "b" script

                    # for the ugly details
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the
                    # for the ugly details
 
 USE_SWIG = 0       # Should we actually execute SWIG, or just use the


@@ -137,7 +137,7 @@ sys.argv = filter(None, sys.argv)
 
 
 if CORE_ONLY:
 
 
 if CORE_ONLY:

-    BUILD_GLCANVAS = 0
+    BUILD_GLCANVAS = 0 #0

     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0
     BUILD_OGL = 0
     BUILD_STC = 0
     BUILD_XRC = 0


@@ -852,7 +852,8 @@ if __name__ == "__main__":
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',
               packages = [PKGDIR,
                           PKGDIR+'.lib',
                           PKGDIR+'.lib.editor',

-                          PKGDIR+'.lib.mixins'
+                          PKGDIR+'.lib.mixins',
+                          PKGDIR+'.lib.PyCrust',

                           ],
 
               ext_package = PKGDIR,
                           ],
 
               ext_package = PKGDIR,