X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f32afe1c2c8a663d5b1fe6816c6999100ac832cf..9e279f14628b269555982af234b0f013b535adff:/wxPython/setup.py

diff --git a/wxPython/setup.py b/wxPython/setup.py
index 74616671ea..6a9954967b 100755
--- 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
 #----------------------------------------------------------------------
 
-VERSION          = "2.3.2b5"
+VERSION          = "2.3.2b7"
 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.)
 
-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)
 
+def libFlag():
+    if FINAL:
+        return ''
+    elif HYBRID:
+        return 'h'
+    else:
+        return 'd'
+
+
 #----------------------------------------------------------------------
 # Some other globals
 #----------------------------------------------------------------------
@@ -148,6 +157,7 @@ if os.name == 'nt':
         FINAL = 0
 
     includes = ['src',
+                opj(WXDIR, 'lib', 'mswdll' + libFlag()),
                 opj(WXDIR, 'include'),
                 ]
 
@@ -188,16 +198,9 @@ if os.name == 'nt':
         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]
+
     if bcpp_compiling:
         libs = ['wx'+WXBCPPLIBVER]
 
@@ -556,14 +559,16 @@ if not GL_ONLY and BUILD_STC:
                      '%s/scintilla/src/RESearch.cxx' % STCLOC,
                      '%s/scintilla/src/ScintillaBase.cxx' % STCLOC,
                      '%s/scintilla/src/Style.cxx' % STCLOC,
+                     '%s/scintilla/src/StyleContext.cxx' % STCLOC,
                      '%s/scintilla/src/UniConversion.cxx' % STCLOC,
                      '%s/scintilla/src/ViewStyle.cxx' % STCLOC,
                      '%s/scintilla/src/WindowAccessor.cxx' % STCLOC,
 
                      '%s/scintilla/src/LexAda.cxx' % STCLOC,
                      '%s/scintilla/src/LexAVE.cxx' % STCLOC,
-                     '%s/scintilla/src/LexConf.cxx' % STCLOC,
                      '%s/scintilla/src/LexCPP.cxx' % STCLOC,
+                     '%s/scintilla/src/LexConf.cxx' % STCLOC,
+                     '%s/scintilla/src/LexCrontab.cxx' % STCLOC,
                      '%s/scintilla/src/LexEiffel.cxx' % STCLOC,
                      '%s/scintilla/src/LexHTML.cxx' % STCLOC,
                      '%s/scintilla/src/LexLisp.cxx' % STCLOC,