From 9ecfb6355c9cc0b8b6678c13db19933e208947f5 Mon Sep 17 00:00:00 2001
From: "Janet B. Anderson" <jba@aps.anl.gov>
Date: Tue, 13 Oct 2009 15:54:39 +0000
Subject: [PATCH] Updated for windows-x64 builds.

---
 configure/os/CONFIG.win32-x86.windows-x64   | 28 +++++++++++++++++++++
 configure/os/CONFIG.windows-x64.Common      |  8 +++---
 configure/os/CONFIG.windows-x64.windows-x64 | 21 ++++++++++------
 3 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 configure/os/CONFIG.win32-x86.windows-x64

diff --git a/configure/os/CONFIG.win32-x86.windows-x64 b/configure/os/CONFIG.win32-x86.windows-x64
new file mode 100644
index 000000000..9e2f9dd9d
--- /dev/null
+++ b/configure/os/CONFIG.win32-x86.windows-x64
@@ -0,0 +1,28 @@
+# CONFIG.win-x86.windows-x64
+#
+# $Id$
+# This file is maintained by the build community.
+#
+# Definitions for windows-x64 target archs when host arch is win32-x86
+# Sites may override these definitions in CONFIG_SITE.win32-x86.windows-x64
+#-------------------------------------------------------
+
+-include $(CONFIG)/os/CONFIG.Common.win32-x86
+-include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
+
+ARCH_DEP_CPPFLAGS += /favor:blend
+#ARCH_DEP_CPPFLAGS += /Wp64
+
+#	/favor:blend	both AMD64 and INTEL64
+#	/favor:AMD64
+#	/favor:INTEL64 (new value)
+#	/favor:EN64T   (old value)
+
+OPT_LDFLAGS += /MACHINE:X64
+
+#	/MACHINE:X64
+#	/MACHINE:IA64  (Itanium)
+#	/MACHINE:X86
+
+#The following option does not work
+#ARCH_DEP_CPPFLAGS += /env x64
diff --git a/configure/os/CONFIG.windows-x64.Common b/configure/os/CONFIG.windows-x64.Common
index 0a8463626..4cb566546 100644
--- a/configure/os/CONFIG.windows-x64.Common
+++ b/configure/os/CONFIG.windows-x64.Common
@@ -1,13 +1,13 @@
-# CONFIG.win-x86_64.Common
+# CONFIG.windows-x64.Common
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for win-x86_64 host archs
-# Sites may override these definitions in CONFIG_SITE.win-x86_64.Common
+# Definitions for windows-x64 host archs
+# Sites may override these definitions in CONFIG_SITE.windows-x64.Common
 #-------------------------------------------------------
 
 -include $(CONFIG)/os/CONFIG.win32-x86.Common
 
-WIND_HOST_TYPE = x86_64-win
+WIND_HOST_TYPE = x64-win
 
diff --git a/configure/os/CONFIG.windows-x64.windows-x64 b/configure/os/CONFIG.windows-x64.windows-x64
index 385bbeab4..ce5dd5f9b 100644
--- a/configure/os/CONFIG.windows-x64.windows-x64
+++ b/configure/os/CONFIG.windows-x64.windows-x64
@@ -1,20 +1,25 @@
-# CONFIG.win-x86_64.win-x86_64
+# CONFIG.windows-x64.windows-x64
 #
 # $Id$
 # This file is maintained by the build community.
 #
-# Definitions for win-x86_64 target archs when host arch is win-x86_64
-# Sites may override these definitions in CONFIG_SITE.win-x86_64.win-x86_64
+# Definitions for windows-x64 target archs when host arch is windows-x64
+# Sites may override these definitions in CONFIG_SITE.windows-x64.windows-x64
 #-------------------------------------------------------
 
 -include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
 
-#-------------------------------------------------------
+ARCH_DEP_CPPFLAGS += /favor:blend
+#ARCH_DEP_CPPFLAGS += /Wp64
 
+#	/favor:blend	both AMD64 and INTEL64
+#	/favor:AMD64
+#	/favor:INTEL64 (new value)
+#	/favor:EN64T   (old value)
 
-STATIC_LDLIBS_YES=ws2_64.lib advapi64.lib user64.lib kernel64.lib winmm.lib
+OPT_LDFLAGS += /MACHINE:X64
 
-WIN_DLLFLAGS = /subsystem:windows /dll $(OPT_LDFLAGS) $(TARGET_LDFLAGS) $(LIB_LDFLAGS)
-
-LINK.shrlib = $(WINLINK) /nologo $(WIN_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG)
+#	/MACHINE:X64
+#	/MACHINE:IA64  (Itanium)
+#	/MACHINE:X86