Updated for new library and DLL names on MSW

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

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 684558bef9bdc9e2a1e7fd718b66ed5e15851cb5..6a9954967bf7080354d08973726824eb4aa7475c 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -13,7 +13,7 @@ from my_distutils import run_swig, contrib_copy_tree
 # flags and values that affect this script
 #----------------------------------------------------------------------
 
 # flags and values that affect this script
 #----------------------------------------------------------------------
 

-VERSION          = "2.3.2b6"
+VERSION          = "2.3.2b7"

 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"
 DESCRIPTION      = "Cross platform GUI toolkit for Python"
 AUTHOR           = "Robin Dunn"
 AUTHOR_EMAIL     = "Robin Dunn <robin@alldunn.com>"


@@ -64,7 +64,7 @@ HYBRID = 0         # 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.)
 
                    # wxWindows must have been built with /MD, not /MDd
                    # (using FINAL=hybrid will do it.)
 

-WXDLLVER = '23_2'  # Version part of DLL name
+WXDLLVER = '232'  # Version part of DLL name

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -77,6 +77,15 @@ def opj(*args):
     path = apply(os.path.join, args)
     return os.path.normpath(path)
 
     path = apply(os.path.join, args)
     return os.path.normpath(path)
 

+def libFlag():
+    if FINAL:
+        return ''
+    elif HYBRID:
+        return 'h'
+    else:
+        return 'd'
+
+

 #----------------------------------------------------------------------
 # Some other globals
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------
 # Some other globals
 #----------------------------------------------------------------------


@@ -148,6 +157,7 @@ if os.name == 'nt':
         FINAL = 0
 
     includes = ['src',
         FINAL = 0
 
     includes = ['src',

+                opj(WXDIR, 'lib', 'mswdll' + libFlag()),

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


@@ -188,16 +198,9 @@ if os.name == 'nt':
         defines.append( ('__WXDEBUG__', None) )
 
     libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
         defines.append( ('__WXDEBUG__', None) )
 
     libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']

-
-    if FINAL:
-        wxdll = 'wx' + WXDLLVER
-    elif HYBRID:
-        wxdll = 'wx' + WXDLLVER + 'h'
-    else:
-        wxdll = 'wx' + WXDLLVER + 'd'
-
-
+    wxdll = 'wxmsw' + WXDLLVER + libFlag()

     libs = [wxdll]
     libs = [wxdll]

+

     if bcpp_compiling:
         libs = ['wx'+WXBCPPLIBVER]
 
     if bcpp_compiling:
         libs = ['wx'+WXBCPPLIBVER]