checked in forgottern parts of MSLU changes

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 47ca253c00f7fb505340ed10cf22e8a400b85c87..28ed092872c1d28feb0aad678c081882a7e1dee0 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -218,7 +218,9 @@ if os.name == 'nt':
             'advapi32', 'wsock32']
 
 
             'advapi32', 'wsock32']
 
 

-    cflags = [] #['/GX-']  # workaround for internal compiler error in MSVC on some machines
+    cflags = [
+             # '/GX-'  # workaround for internal compiler error in MSVC on some machines
+             ]

     lflags = None
 
 
     lflags = None
 
 


@@ -323,8 +325,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',
-                   ##'grid.i', 'html.i', 'htmlhelp.i', 'calendar.i', 'utils.i',
+                   'filesys.i', 'streams.i', 'utils.i'

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


@@ -390,20 +391,6 @@ if not GL_ONLY:
     wxpExtensions.append(ext)
 
 
     wxpExtensions.append(ext)
 
 

-    # Extension for the utils module
-    swig_sources = run_swig(['utils.i'], 'src', GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
-    ext = Extension('utilsc', swig_sources,
-                    include_dirs =  includes,
-                    define_macros = defines,
-                    library_dirs = libdirs,
-                    libraries = libs,
-                    extra_compile_args = cflags,
-                    extra_link_args = lflags,
-                    )
-    wxpExtensions.append(ext)
-
-

     # Extension for the calendar module
     swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)
     # Extension for the calendar module
     swig_sources = run_swig(['calendar.i'], 'src', GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)


@@ -705,6 +692,7 @@ if not GL_ONLY and BUILD_XRC:
                                 '%s/xh_frame.cpp' % XMLLOC,
 
                                 '%s/xh_gauge.cpp' % XMLLOC,
                                 '%s/xh_frame.cpp' % XMLLOC,
 
                                 '%s/xh_gauge.cpp' % XMLLOC,

+                                '%s/xh_gdctl.cpp' % XMLLOC,

                                 '%s/xh_html.cpp' % XMLLOC,
                                 '%s/xh_listb.cpp' % XMLLOC,
                                 '%s/xh_listc.cpp' % XMLLOC,
                                 '%s/xh_html.cpp' % XMLLOC,
                                 '%s/xh_listb.cpp' % XMLLOC,
                                 '%s/xh_listc.cpp' % XMLLOC,


@@ -730,13 +718,8 @@ if not GL_ONLY and BUILD_XRC:
 
                                 '%s/xh_unkwn.cpp' % XMLLOC,
                                 '%s/xml.cpp' % XMLLOC,
 
                                 '%s/xh_unkwn.cpp' % XMLLOC,
                                 '%s/xml.cpp' % XMLLOC,

-                                '%s/xmlbin.cpp' % XMLLOC,
-                                '%s/xmlbinz.cpp' % XMLLOC,
-                                '%s/xmlexpat.cpp' % XMLLOC,
-

                                 '%s/xmlres.cpp' % XMLLOC,
                                 '%s/xmlrsall.cpp' % XMLLOC,
                                 '%s/xmlres.cpp' % XMLLOC,
                                 '%s/xmlrsall.cpp' % XMLLOC,

-                                '%s/xmlwrite.cpp' % XMLLOC,

 
                              ] + swig_sources,
 
 
                              ] + swig_sources,