From 9b4fe86559a2d315ffbe241266824c21cca80aa5 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 10 Jul 2012 05:15:00 +0000 Subject: [PATCH] AMD64 --> x64 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- build.py | 4 ++-- buildtools/config.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index 80fc93ad..83d48021 100755 --- a/build.py +++ b/build.py @@ -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") diff --git a/buildtools/config.py b/buildtools/config.py index 4c4ad350..b6021dc2 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -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()