[ 1505048 ] wxHtml rendering of underlined text

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index e1f378fb8bb38c84392173ab608c81cd16d32e50..34b0b5dacc50ebb6c25f0636130d6661cd5ae87f 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -156,8 +156,8 @@ CLEANUP.append('licence')
 
 
 if os.name == 'nt':
-    build_locale_dir(opj(PKGDIR, 'locale'))
-    DATA_FILES += build_locale_list(opj(PKGDIR, 'locale'))
+    build_locale_dir(opj(PKGDIR, 'i18n'))
+    DATA_FILES += build_locale_list(opj(PKGDIR, 'i18n'))
 
 
 if os.name == 'nt':
@@ -207,11 +207,11 @@ swig_sources = run_swig(['gdi.i'], 'src', GENDIR, PKGDIR,
                          'src/_pen.i',
                          'src/_palette.i',
                          'src/_renderer.i',
-##                         'src/_pseudodc.i',
+                         'src/_pseudodc.i',
                          ],
                         True)
 ext = Extension('_gdi_', ['src/drawlist.cpp',
-##                          'src/pseudodc.cpp'
+                          'src/pseudodc.cpp'
                           ] + swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
@@ -488,6 +488,32 @@ wxpExtensions.append(ext)
 
 
 
+swig_sources = run_swig(['aui.i'], 'src', GENDIR, PKGDIR,
+                        USE_SWIG, swig_force,
+                        swig_args + ['-I'+opj(WXDIR, 'include/wx/aui')],
+                        swig_deps + ['src/_aui_docstrings.i',
+                                     opj(WXDIR, 'include/wx/aui/framemanager.h'),
+                                     opj(WXDIR, 'include/wx/aui/floatpane.h'),
+                                     opj(WXDIR, 'include/wx/aui/dockart.h'),
+                                     opj(WXDIR, 'include/wx/aui/auibook.h'),
+                                     ])
+if not MONOLITHIC:
+    auiLib = makeLibName('aui')
+else:
+    auiLib = []
+ext = Extension('_aui', swig_sources,
+                include_dirs =  includes,
+                define_macros = defines,
+                library_dirs = libdirs,
+                libraries = libs + auiLib,
+                extra_compile_args = cflags,
+                extra_link_args = lflags,
+                **depends
+                )
+wxpExtensions.append(ext)
+
+
+
 
 
 #----------------------------------------------------------------------
@@ -658,7 +684,8 @@ if BUILD_GIZMOS:
     location = 'contrib/gizmos'
 
     swig_sources = run_swig(['gizmos.i'], location, GENDIR, PKGDIR,
-                            USE_SWIG, swig_force, swig_args, swig_deps)
+                            USE_SWIG, swig_force, swig_args, swig_deps +
+                            [ '%s/_treelist.i' % location])
 
     ext = Extension('_gizmos',
                     [ '%s/treelistctrl.cpp' % opj(location, 'wxCode/src') ] + swig_sources,