Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated for new library and DLL names on MSW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2001-10-21 03:49:09 +00:00
parent dfef5d5165
commit a4fbdd76c1
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wxPython/setup.py
View File

@@ -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" DESCRIPTION = "Cross platform GUI toolkit for Python"
AUTHOR = "Robin Dunn" AUTHOR = "Robin Dunn"
AUTHOR_EMAIL = "Robin Dunn <robin@alldunn.com>" 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 # wxWindows must have been built with /MD, not /MDd
# (using FINAL=hybrid will do it.) # (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) path = apply(os.path.join, args)
return os.path.normpath(path) 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 FINAL = 0
includes = ['src', 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) ) defines.append( ('__WXDEBUG__', None) )
libdirs = [opj(WXDIR, 'lib'), 'build\\ilib'] libdirs = [opj(WXDIR, 'lib'), 'build\\ilib']
wxdll = 'wxmsw' + WXDLLVER + libFlag()
if FINAL:
wxdll = 'wx' + WXDLLVER
elif HYBRID:
wxdll = 'wx' + WXDLLVER + 'h'
else:
wxdll = 'wx' + WXDLLVER + 'd'
libs = [wxdll] libs = [wxdll]
if bcpp_compiling: if bcpp_compiling:
libs = ['wx'+WXBCPPLIBVER] libs = ['wx'+WXBCPPLIBVER]