diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index ff70cd0c57..7c7bf37f2a 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1282,13 +1282,13 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 DIR_SUFFIX_CPU = _amd64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 DIR_SUFFIX_CPU = _amd64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 DIR_SUFFIX_CPU = _ia64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
@@ -1303,13 +1303,13 @@ LIBTYPE_SUFFIX = lib
 !if "$(SHARED)" == "1"
 LIBTYPE_SUFFIX = dll
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
diff --git a/contrib/build/gizmos/makefile.vc b/contrib/build/gizmos/makefile.vc
index 7177718172..0ba35f3fd8 100644
--- a/contrib/build/gizmos/makefile.vc
+++ b/contrib/build/gizmos/makefile.vc
@@ -111,13 +111,13 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 DIR_SUFFIX_CPU = _amd64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 DIR_SUFFIX_CPU = _amd64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 DIR_SUFFIX_CPU = _ia64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
@@ -132,13 +132,13 @@ LIBTYPE_SUFFIX = lib
 !if "$(SHARED)" == "1"
 LIBTYPE_SUFFIX = dll
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
diff --git a/contrib/build/stc/makefile.vc b/contrib/build/stc/makefile.vc
index 75bd93a2b3..c60826adf5 100644
--- a/contrib/build/stc/makefile.vc
+++ b/contrib/build/stc/makefile.vc
@@ -239,13 +239,13 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 DIR_SUFFIX_CPU = _amd64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 DIR_SUFFIX_CPU = _amd64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 DIR_SUFFIX_CPU = _ia64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
@@ -260,13 +260,13 @@ LIBTYPE_SUFFIX = lib
 !if "$(SHARED)" == "1"
 LIBTYPE_SUFFIX = dll
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 692491e118..8d51e707a4 100644
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -50,13 +50,13 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 DIR_SUFFIX_CPU = _amd64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 DIR_SUFFIX_CPU = _amd64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 DIR_SUFFIX_CPU = _ia64
 !endif
 !if "$(TARGET_CPU)" == "ia64"
@@ -71,13 +71,13 @@ LIBTYPE_SUFFIX = lib
 !if "$(SHARED)" == "1"
 LIBTYPE_SUFFIX = dll
 !endif
-!if "$(TARGET_CPU)" == "amd64"
+!if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:AMD64
 !endif
-!if "$(TARGET_CPU)" == "ia64"
+!if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
 !if "$(TARGET_CPU)" == "ia64"