diff --git a/configure/os/CONFIG.win32-x86.windows-x64 b/configure/os/CONFIG.win32-x86.windows-x64 index 8c51ef704..d0bcbd4cf 100644 --- a/configure/os/CONFIG.win32-x86.windows-x64 +++ b/configure/os/CONFIG.win32-x86.windows-x64 @@ -10,19 +10,9 @@ -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.windows-x64 b/configure/os/CONFIG.windows-x64.windows-x64 index f9144718f..baa1ba945 100644 --- a/configure/os/CONFIG.windows-x64.windows-x64 +++ b/configure/os/CONFIG.windows-x64.windows-x64 @@ -9,14 +9,6 @@ -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 diff --git a/configure/os/CONFIG_SITE.Common.windows-x64-static b/configure/os/CONFIG_SITE.Common.windows-x64-static new file mode 100644 index 000000000..5da06c053 --- /dev/null +++ b/configure/os/CONFIG_SITE.Common.windows-x64-static @@ -0,0 +1,11 @@ +# CONFIG_SITE.Common.windows-x64-static +# +# $Revision-Id$ +# +# Site Specific definitions for windows-x64-static target +# Only the local epics system manager should modify this file + +# 64-bit Visual Studio 2010 builds fail when built optimized. +# If you are using a newer version you can try removing this: +HOST_OPT = NO +