added missing headers

[wxWidgets.git] / wxPython / setup.py

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),
 
     defines = [ ('WIN32', None),
                 ('_WINDOWS', None),

-##                 ('__WIN32__', None),
-##                 ('__WINDOWS__', None),
-##                 ('WINVER', '0x0400'),
-##                 ('__WIN95__', None),
-##                 ('STRICT', None),

 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),


@@ -431,8 +426,13 @@ if os.name == 'nt':
         defines.append( ('__WXDEBUG__', None) )
 
     libdirs = [ opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll') ]
         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',
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
             'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',