The richtext code is now in it's own lib/DLL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/config.py b/wxPython/config.py
index b08b68a0bd27ee0a7f625b5952fb0f7ccf57eada..3b2de23850342d828f9eca61894074d508152ede 100644 (file)
--- a/wxPython/config.py
+++ b/wxPython/config.py
@@ -698,7 +698,6 @@ if os.name == 'nt':
                  makeLibName('core')[0],
                  makeLibName('adv')[0],
                  makeLibName('html')[0],
                  makeLibName('core')[0],
                  makeLibName('adv')[0],
                  makeLibName('html')[0],

-                 makeLibName('xrc')[0],

                  ]
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
                  ]
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',

diff --git a/wxPython/setup.py b/wxPython/setup.py
index e61f68bfb293d016df686c3592d8354a0a5419a1..42d59936a9366b327dfdc36afd5ce290f4c9fe7d 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -453,7 +453,7 @@ ext = Extension('_xrc',
                 define_macros = defines,
 
                 library_dirs = libdirs,
                 define_macros = defines,
 
                 library_dirs = libdirs,

-                libraries = libs,
+                libraries = libs + makeLibName('xrc'),

 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
 
                 extra_compile_args = cflags,
                 extra_link_args = lflags,


@@ -468,7 +468,7 @@ ext = Extension('_richtext', swig_sources,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,
                 include_dirs =  includes,
                 define_macros = defines,
                 library_dirs = libdirs,

-                libraries = libs,
+                libraries = libs + makeLibName('richtext'),

                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends
                 extra_compile_args = cflags,
                 extra_link_args = lflags,
                 **depends