X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8510c2f40d53a35b6cc73bcc6af58e9cfd70509..d285d708a229ece6ad606a460bcbf048c65d252b:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index ecd5a4a870..4704c47588 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree # flags and values that affect this script #---------------------------------------------------------------------- -VERSION = "2.3.3pre4" +VERSION = "2.3.3pre5" DESCRIPTION = "Cross platform GUI toolkit for Python" AUTHOR = "Robin Dunn" AUTHOR_EMAIL = "Robin Dunn " @@ -36,11 +36,11 @@ BUILD_GIZMOS = 1 # Build a module for the gizmos contrib library BUILD_DLLWIDGET = 1# Build a module that enables unknown wx widgets # to be loaded from a DLL and to be used from Python. -BUILD_IEWIN = 0 # Internet Explorer wrapper (experimental) + # Internet Explorer wrapper (experimental) +BUILD_IEWIN = (os.name == 'nt') 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 # for the ugly details @@ -137,8 +137,8 @@ if bcpp_compiling: # Boolean (int) flags for flag in ['BUILD_GLCANVAS', 'BUILD_OGL', 'BUILD_STC', 'BUILD_XRC', - 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', - 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG' + 'BUILD_GIZMOS', 'BUILD_DLLWIDGET', 'BUILD_IEWIN', + 'CORE_ONLY', 'USE_SWIG', 'IN_CVS_TREE', 'UNICODE', 'UNDEF_NDEBUG', 'FINAL', 'HYBRID', ]: for x in range(len(sys.argv)): if string.find(sys.argv[x], flag) == 0: @@ -170,6 +170,7 @@ if CORE_ONLY: BUILD_XRC = 0 BUILD_GIZMOS = 0 BUILD_DLLWIDGET = 0 + BUILD_IEWIN = 0 if UNICODE and os.name != 'nt': @@ -686,6 +687,7 @@ if not GL_ONLY and BUILD_IEWIN: ext = Extension('iewinc', ['%s/IEHtmlWin.cpp' % location, + '%s/wxactivex.cpp' % location, ] + swig_sources, include_dirs = includes,