Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 12:00:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt to new lib dirs, etc. in the Windows build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-07-02 02:59:30 +00:00
parent 9c7a4c3f99
commit a3c43d0e04
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build.py
View File

@@ -29,7 +29,8 @@ from distutils.dep_util import newer, newer_group
from buildtools.config import Config, msg, opj, posixjoin, loadETG, etg2sip, findCmd, \ from buildtools.config import Config, msg, opj, posixjoin, loadETG, etg2sip, findCmd, \
phoenixDir, wxDir, copyIfNewer, copyFile, \ phoenixDir, wxDir, copyIfNewer, copyFile, \
macFixDependencyInstallName, macSetLoaderNames, \ macFixDependencyInstallName, macSetLoaderNames, \
getSvnRev, runcmd, textfile_open, getSipFiles getSvnRev, runcmd, textfile_open, getSipFiles, \
getVisCVersion
import buildtools.version as version import buildtools.version as version
@@ -267,9 +268,9 @@ def getMSWSettings(options):
msw = MSWsettings() msw = MSWsettings()
msw.CPU = os.environ.get('CPU') msw.CPU = os.environ.get('CPU')
if msw.CPU == 'AMD64': if msw.CPU == 'AMD64':
msw.dllDir = posixjoin(wxDir(), "lib", "vc_amd64_dll") msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_amd64_dll" % getVisCVersion())
else: else:
msw.dllDir = posixjoin(wxDir(), "lib", "vc_dll") msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_dll" % getVisCVersion())
msw.buildDir = posixjoin(wxDir(), "build", "msw") msw.buildDir = posixjoin(wxDir(), "build", "msw")
msw.dll_type = "u" msw.dll_type = "u"
@@ -1098,7 +1099,7 @@ def clean_wx(options, args):
deleteIfExists(opj(msw.dllDir, 'msw'+msw.dll_type)) deleteIfExists(opj(msw.dllDir, 'msw'+msw.dll_type))
delFiles(glob.glob(opj(msw.dllDir, 'wx*%s%s*' % (version2_nodot, msw.dll_type)))) delFiles(glob.glob(opj(msw.dllDir, 'wx*%s%s*' % (version2_nodot, msw.dll_type))))
delFiles(glob.glob(opj(msw.dllDir, 'wx*%s%s*' % (version3_nodot, msw.dll_type)))) delFiles(glob.glob(opj(msw.dllDir, 'wx*%s%s*' % (version3_nodot, msw.dll_type))))
deleteIfExists(opj(msw.buildDir, 'vc_msw'+msw.dll_type+'dll')) deleteIfExists(opj(msw.buildDir, 'vc%s_msw%sdll' % (getVisCVersion(), +msw.dll_type)))
if options.both: if options.both:
options.debug = False options.debug = False
@@ -1221,9 +1222,7 @@ def bdist(options, args):
readme = "packaging/README.txt" readme = "packaging/README.txt"
wxlibdir = os.path.join(getBuildDir(options), "lib") wxlibdir = os.path.join(getBuildDir(options), "lib")
if sys.platform.startswith('win'): if sys.platform.startswith('win'):
#dllext = ".dll" environ_script = None
#wxlibdir = os.path.join(wxDir(), "lib", "vc_dll")
environ_script = None #"packaging/phoenix_environ.bat"
elif sys.platform.startswith('darwin'): elif sys.platform.startswith('darwin'):
dllext = ".dylib" dllext = ".dylib"

12
buildtools/config.py
View File

@@ -155,9 +155,9 @@ class Configuration(object):
self.WXPLAT = '__WXMSW__' self.WXPLAT = '__WXMSW__'
if os.environ.get('CPU', None) == 'AMD64': if os.environ.get('CPU', None) == 'AMD64':
self.VCDLL = 'vc_amd64_dll' self.VCDLL = 'vc%s_amd64_dll' % getVisCVersion()
else: else:
self.VCDLL = 'vc_dll' self.VCDLL = 'vc%s_dll' % getVisCVersion()
self.includes += ['include', self.includes += ['include',
opj(self.WXDIR, 'lib', self.VCDLL, 'msw' + self.libFlag()), opj(self.WXDIR, 'lib', self.VCDLL, 'msw' + self.libFlag()),
@@ -829,3 +829,11 @@ def getSipFiles(names):
def getVisCVersion():
text = runcmd("cl.exe", getOutput=True)
if 'Version 15' in text:
return '90'
# TODO: Add more tests to get the other versions...
else:
return 'FIXME'