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

AMD64 --> x64

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2012-07-10 05:15:00 +00:00
parent d2ade55810
commit 9b4fe86559
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.py
View File

@@ -267,8 +267,8 @@ def getMSWSettings(options):
pass
msw = MSWsettings()
msw.CPU = os.environ.get('CPU')
if msw.CPU == 'AMD64':
msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_amd64_dll" % getVisCVersion())
if msw.CPU in ['AMD64', 'X64']:
msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_x64_dll" % getVisCVersion())
else:
msw.dllDir = posixjoin(wxDir(), "lib", "vc%s_dll" % getVisCVersion())
msw.buildDir = posixjoin(wxDir(), "build", "msw")

4
buildtools/config.py
View File

@@ -154,8 +154,8 @@ class Configuration(object):
# will probably vary...
self.WXPLAT = '__WXMSW__'
if os.environ.get('CPU', None) == 'AMD64':
self.VCDLL = 'vc%s_amd64_dll' % getVisCVersion()
if os.environ.get('CPU', None) in ['AMD64', 'X64']:
self.VCDLL = 'vc%s_x64_dll' % getVisCVersion()
else:
self.VCDLL = 'vc%s_dll' % getVisCVersion()