mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-05 19:40:12 +01:00
Verify that the cl.exe used for the wx and py builds is the one that the target Python wants to be built with, and also set the environment vars from that version of the compiler's vcvarsall.bat the same way that distutils does it. Ensure that CPU is set for the wx build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -792,6 +792,8 @@ def runcmd(cmd, getOutput=False, echoCmd=True, fatal=True):
|
||||
# Failed!
|
||||
#raise subprocess.CalledProcessError(rval, cmd)
|
||||
print("Command '%s' failed with exit code %d." % (cmd, rval))
|
||||
if getOutput:
|
||||
print(output)
|
||||
if fatal:
|
||||
sys.exit(rval)
|
||||
|
||||
@@ -839,6 +841,8 @@ def getSipFiles(names):
|
||||
|
||||
def getVisCVersion():
|
||||
text = runcmd("cl.exe", getOutput=True, echoCmd=False)
|
||||
if 'Version 13' in text:
|
||||
return '71'
|
||||
if 'Version 15' in text:
|
||||
return '90'
|
||||
# TODO: Add more tests to get the other versions...
|
||||
|
||||
Reference in New Issue
Block a user