Allow building with wxUSE_CALENDARCTRL=0

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index ae094c25f03b9cba9230eb1c9da4683bfe5a3eed..3a22dfe18638293b1ec2d74c5274871fc1ae0bf9 100755 (executable)
--- 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
 #----------------------------------------------------------------------
 
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.3pre"
+VERSION          = "2.3.3pre2"

 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"


@@ -267,7 +267,7 @@ if os.name == 'nt':
 
     elif bcpp_compiling and not FINAL:
         cflags = cflags + ['/Od', '/v', '/y']
 
     elif bcpp_compiling and not FINAL:
         cflags = cflags + ['/Od', '/v', '/y']

-        lflags = lflags + ['/v', ]   ## '/PDB:NONE']
+        lflags = lflags + ['/v', ]

 
 
 
 
 
 


@@ -357,7 +357,7 @@ if not GL_ONLY:
                    'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
                    'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
                    'printfw.i', 'sizers.i', 'clip_dnd.i',
                    'misc.i', 'misc2.i', 'gdi.i', 'mdi.i', 'controls.i',
                    'controls2.i', 'cmndlgs.i', 'stattool.i', 'frames.i', 'image.i',
                    'printfw.i', 'sizers.i', 'clip_dnd.i',

-                   'filesys.i', 'streams.i', 'utils.i'
+                   'filesys.i', 'streams.i', 'utils.i', 'fonts.i'

                    ]
 
     swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
                    ]
 
     swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,


@@ -365,7 +365,7 @@ if not GL_ONLY:
 
     copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
     copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
 
     copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
     copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)

-
+    copy_file('src/wxc.pyd.manifest', PKGDIR, update=1, verbose=0)

 
     if IN_CVS_TREE:   # update the licence files
         mkpath('licence')
 
     if IN_CVS_TREE:   # update the licence files
         mkpath('licence')