X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ef86e32ddee8d77078b1e18affa3cadcdc420d2..85b88942cca1395ce7c827233e64aaa5eef838d2:/wxPython/setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index e95880bca7..cd5aac2069 100755
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -106,7 +106,8 @@ HYBRID = 1         # If set and not debug or FINAL, then build a
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 
-WXDLLVER = '250'   # Version part of wxWindows DLL name
+                   # Version part of wxWindows LIB/DLL names
+WXDLLVER = '%d%d' % (VER_MAJOR, VER_MINOR)
 
 
 #----------------------------------------------------------------------
@@ -321,14 +322,14 @@ def makeLibName(name):
     if os.name == 'posix':
         libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
     else:
-        raise NotImplementedError
+        libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
 
     return [libname]
 
 
 
 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:
@@ -349,7 +350,7 @@ def adjustCFLAGS(cflags, defines, includes):
 
 
 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':
@@ -401,17 +402,13 @@ if os.name == 'nt':
     GENDIR = 'msw'
 
     includes = ['src',
-                opj(WXDIR, 'lib', 'mswdll' + libFlag()),
+                opj(WXDIR, 'lib', 'vc_dll', 'msw' + libFlag()),
                 opj(WXDIR, 'include'),
+                opj(WXDIR, 'contrib', 'include'),
                 ]
 
     defines = [ ('WIN32', None),
-                ('__WIN32__', None),
                 ('_WINDOWS', None),
-                ('__WINDOWS__', None),
-                ('WINVER', '0x0400'),
-                ('__WIN95__', None),
-                ('STRICT', None),
 
                 (WXPLAT, None),
                 ('WXUSINGDLL', '1'),
@@ -428,9 +425,14 @@ if os.name == 'nt':
     if not FINAL or HYBRID:
         defines.append( ('__WXDEBUG__', None) )
 
-    libdirs = [ opj(WXDIR, 'lib') ]
-    wxdll = 'wxmsw' + WXDLLVER + libFlag()
-    libs = [ wxdll ]
+    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',
+             makeLibName('core')[0],
+             makeLibName('adv')[0],
+             makeLibName('html')[0],
+             ]
 
     libs = libs + ['kernel32', 'user32', 'gdi32', 'comdlg32',
             'winspool', 'winmm', 'shell32', 'oldnames', 'comctl32',
@@ -717,7 +719,6 @@ if BUILD_GLCANVAS:
     msg('Preparing GLCANVAS...')
     location = 'contrib/glcanvas'
     swig_files = ['glcanvas.i']
-    other_sources = []
 
     swig_sources = run_swig(swig_files, location, GENDIR, PKGDIR,
                             USE_SWIG, swig_force, swig_args, swig_deps)
@@ -728,12 +729,11 @@ if BUILD_GLCANVAS:
         gl_lflags = gl_config.split() + lflags
         gl_libs = libs
     else:
-        other_sources = [opj(location, 'msw/myglcanvas.cpp')]
-        gl_libs = libs + ['opengl32', 'glu32']
+        gl_libs = libs + ['opengl32', 'glu32'] + makeLibName('gl')
         gl_lflags = lflags
 
     ext = Extension('glcanvasc',
-                    swig_sources + other_sources,
+                    swig_sources,
 
                     include_dirs = includes,
                     define_macros = defines,
@@ -786,7 +786,10 @@ if BUILD_OGL:
 if BUILD_STC:
     msg('Preparing STC...')
     location = 'contrib/stc'
-    STC_H = opj(WXPREFIX, 'include/wx/stc')
+    if os.name == 'nt':
+        STC_H = opj(WXDIR, 'contrib', 'include/wx/stc')
+    else:
+        STC_H = opj(WXPREFIX, 'include/wx/stc')
 
 ## NOTE: need to add this to the stc.bkl...
 
@@ -903,7 +906,7 @@ if BUILD_GIZMOS:
                             USE_SWIG, swig_force, swig_args, swig_deps)
 
     ext = Extension('gizmosc',
-                    swig_sources,
+                    [ '%s/treelistctrl.cpp' % location ] + swig_sources,
 
                     include_dirs =  includes,
                     define_macros = defines,