Use multi-lib build on MSW, and other tweaks

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

diff --git a/wxPython/b.bat b/wxPython/b.bat
index 79c75bddc0642f39e7c79b434993f584fb9b8a2f..b53ff255f965cbe7940210cbe4a48d6c79122096 100755 (executable)
--- a/wxPython/b.bat
+++ b/wxPython/b.bat
@@ -2,6 +2,7 @@
 REM ----------------------------------------------------------------------
 REM Note:  This is a 4NT script
 REM ----------------------------------------------------------------------
+call wxset.btm
 setlocal
 
 set FLAGS=USE_SWIG=1 IN_CVS_TREE=1

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 80036ac9d367ae2fc40dc97fd4b1c294cb883677..56b3d2c03768452d60c478da814c23baf147b49a 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -409,11 +409,6 @@ if os.name == 'nt':
 
     defines = [ ('WIN32', None),
                 ('_WINDOWS', None),
-##                 ('__WIN32__', None),
-##                 ('__WINDOWS__', None),
-##                 ('WINVER', '0x0400'),
-##                 ('__WIN95__', None),
-##                 ('STRICT', None),
 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
@@ -431,8 +426,13 @@ if os.name == 'nt':
         defines.append( ('__WXDEBUG__', None) )
 
     libdirs = [ opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll') ]
-    wxdll = 'wxmsw' + WXDLLVER + libFlag()
-    libs = [ wxdll ]
+    libs = [ 'wxbase' + WXDLLVER + libFlag(),  # TODO: trim this down to what is really needed for the core
+             'wxbase' + WXDLLVER + libFlag() + '_net',
+             'wxbase' + WXDLLVER + libFlag() + '_xml',
+             makeLibName('core')[0],
+             makeLibName('adv')[0],
+             makeLibName('html')[0],
+             ]
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
             'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',