ChangeLogTag:Wed Feb 15 17:56:02 2006 Steve Huston <shuston@riverace.com>

3 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 27b232c6..513b5965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Wed Feb 15 17:56:02 2006  Steve Huston  <shuston@riverace.com>
+
+        * templates/nmakedll.mpt:
+        * templates/nmakeexe.mpt: Changed WinX86_64 platform name to x64 to be
+          consistent with vc8platforms.mpt. Also set _M_AMD64 in cpu_defines,
+          not _M_AXP64 to be consistent with what Microsoft headers are
+          expecting; also added _AMD64_ to ensure it gets set - windows.h
+          sets it, but if including winnt.h first, it doesn't get set.
+          Thanks to Johnny Willemsen for motivating this change.
+
 Wed Feb 15 18:42:30 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
 
         * README:
diff --git a/templates/nmakedll.mpt b/templates/nmakedll.mpt
index f71bc671..4ea02599 100644
--- a/templates/nmakedll.mpt
+++ b/templates/nmakedll.mpt
@@ -22,10 +22,10 @@ Win64 {
   add_compile         = /Wp64
 }
 
-WinX86_64 {
-  machine_description = X86_64
+x64 {
+  machine_description = x64
   machine             = AMD64
-  cpu_defines         = _M_AXP64
+  cpu_defines         = _M_AMD64 _AMD64_
   add_compile         = /Wp64
   platform_defines    = _WIN64
 }
diff --git a/templates/nmakeexe.mpt b/templates/nmakeexe.mpt
index 08aa6c29..472fd51d 100644
--- a/templates/nmakeexe.mpt
+++ b/templates/nmakeexe.mpt
@@ -25,10 +25,10 @@ Win64 {
   add_compile         = /Wp64
 }
 
-WinX86_64 {
-  machine_description = X86_64
+x64 {
+  machine_description = x64
   machine             = AMD64
-  cpu_defines         = _M_AXP64
+  cpu_defines         = _M_AMD64 _AMD64_
   add_compile         = /Wp64
   platform_defines    = _WIN64
 }