wxMGL compilation fixes

[wxWidgets.git] / wxPython / setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 56b3d2c03768452d60c478da814c23baf147b49a..cd5aac2069a8d02100d99e524f45f1c7bbaa1f7b 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -329,7 +329,7 @@ def makeLibName(name):
 
 
 def adjustCFLAGS(cflags, defines, includes):
 
 
 def adjustCFLAGS(cflags, defines, includes):

-    '''Extrace the raw -I, -D, and -U flags and put them into
+    '''Extract the raw -I, -D, and -U flags and put them into

        defines and includes as needed.'''
     newCFLAGS = []
     for flag in cflags:
        defines and includes as needed.'''
     newCFLAGS = []
     for flag in cflags:


@@ -350,7 +350,7 @@ def adjustCFLAGS(cflags, defines, includes):
 
 
 def adjustLFLAGS(lfags, libdirs, libs):
 
 
 def adjustLFLAGS(lfags, libdirs, libs):

-    '''Extrace the -L and -l flags and put them in libdirs and libs as needed'''
+    '''Extract the -L and -l flags and put them in libdirs and libs as needed'''

     newLFLAGS = []
     for flag in lflags:
         if flag[:2] == '-L':
     newLFLAGS = []
     for flag in lflags:
         if flag[:2] == '-L':


@@ -402,7 +402,7 @@ if os.name == 'nt':
     GENDIR = 'msw'
 
     includes = ['src',
     GENDIR = 'msw'
 
     includes = ['src',

-                opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll'),
+                opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),

                 opj(WXDIR, 'include'),
                 opj(WXDIR, 'contrib', 'include'),
                 ]
                 opj(WXDIR, 'include'),
                 opj(WXDIR, 'contrib', 'include'),
                 ]


@@ -425,7 +425,7 @@ if os.name == 'nt':
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 

-    libdirs = [ opj(WXDIR, 'lib', 'vc_msw' + libFlag() + 'dll') ]
+    libdirs = [ opj(WXDIR, 'lib', 'vc_dll') ]

     libs = [ 'wxbase' + WXDLLVER + libFlag(),  # TODO: trim this down to what is really needed for the core
              'wxbase' + WXDLLVER + libFlag() + '_net',
              'wxbase' + WXDLLVER + libFlag() + '_xml',
     libs = [ 'wxbase' + WXDLLVER + libFlag(),  # TODO: trim this down to what is really needed for the core
              'wxbase' + WXDLLVER + libFlag() + '_net',
              'wxbase' + WXDLLVER + libFlag() + '_xml',