Beginning of bitmap updates

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 3fa72dd9364cc45c7a65852ddbde250c681bf416..f440d5e3d345f25f477a041c5b621f8a56dce085 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
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.0b1"
+VERSION          = "2.3b1"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "robin@alldunn.com"
@@ -151,12 +151,12 @@ if os.name == 'nt':
             'ctl3d32', 'odbc32', 'ole32', 'oleaut32', 'uuid', 'rpcrt4',
             'advapi32', 'wsock32']
 
-    cflags = None
+    cflags = ['/GX-']  # workaround for internal compiler error in MSVC
     lflags = None
 
     if not FINAL and HYBRID:
-        cflags = ['/Od', '/Z7']
-        lflags = ['/DEBUG', ]   ## '/PDB:NONE']
+        cflags = cflags + ['/Od', '/Z7']
+        lflags = ['/DEBUG', ]
 
 
 elif os.name == 'posix':
@@ -199,8 +199,9 @@ if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
 
 print 'Preparing CORE...'
 swig_force = force
-swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone',
+swig_args = ['-c++', '-shadow', '-python', '-keyword', '-dnone', #'-dascii',
              '-I./src', '-D'+WXPLAT]
+swig_deps = ['src/my_typemaps.i']
 
 swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
                'misc.i', 'misc2.i', 'utils.i', 'gdi.i', 'mdi.i', 'controls.i',
@@ -210,7 +211,7 @@ swig_files = [ 'wx.i', 'windows.i', 'windows2.i', 'windows3.i', 'events.i',
                ]
 
 swig_sources = run_swig(swig_files, 'src', GENDIR, PKGDIR,
-                        USE_SWIG, swig_force, swig_args)
+                        USE_SWIG, swig_force, swig_args, swig_deps)
 
 copy_file('src/__init__.py', PKGDIR, update=1, verbose=0)
 copy_file('src/__version__.py', PKGDIR, update=1, verbose=0)
@@ -264,7 +265,7 @@ else:
     swig_files = ['glcanvas.i']
 
     swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args)
+                            USE_SWIG, swig_force, swig_args, swig_deps)
 
     gl_libs = []
     if os.name == 'posix':
@@ -294,7 +295,7 @@ else:
                   'oglcanvas.i']
 
     swig_sources = run_swig(swig_files, location, '', PKGDIR,
-                            USE_SWIG, swig_force, swig_args)
+                            USE_SWIG, swig_force, swig_args, swig_deps)
 
     # make sure local copy of contrib files are up to date
     if IN_CVS_TREE:
@@ -343,7 +344,7 @@ else:
     swig_sources = run_swig(swig_files, location, '', PKGDIR,
                             USE_SWIG, swig_force,
                             swig_args + ['-I'+STC_H, '-I'+location],
-                            [STC_H+'/stc.h'])
+                            swig_deps + [STC_H+'/stc.h'])
 
     # copy a project specific py module to the main package dir
     copy_file(location+'/stc.py', PKGDIR, update=1, verbose=1)