From 1e2cc34c8fe57acaaf8376477933f36338c316c2 Mon Sep 17 00:00:00 2001
From: patthoyts <patthoyts@users.sourceforge.net>
Date: Fri, 14 Dec 2007 02:19:42 +0000
Subject: Support compilation with MSVC9 on AMD64

---
 ChangeLog       | 5 +++++
 win/makefile.vc | 4 +++-
 win/nmakehlp.c  | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2dc2eba..5da1db5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-14  Pat Thoyts <patthoyts@users.sourceforge.net>
+
+	* win/nmakehlp.c:  Support compilation with MSVC9 for AMD64.
+	* win/makefile.vc:
+
 2007-12-13  Jeff Hobbs  <jeffh@ActiveState.com>
 
 	*** 8.5.0 TAGGED FOR RELEASE ***
diff --git a/win/makefile.vc b/win/makefile.vc
index 9cec5ff..70d0b6d 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.115 2007/12/13 15:28:52 dgp Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.116 2007/12/14 02:19:42 patthoyts Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -505,8 +505,10 @@ baselibs   = kernel32.lib user32.lib
 # Avoid 'unresolved external symbol __security_cookie' errors.
 # c.f. http://support.microsoft.com/?id=894573
 !if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
 baselibs   = $(baselibs) bufferoverflowU.lib
 !endif
+!endif
 guilibs	  = $(baselibs) gdi32.lib
 
 
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index ff1905b..ace6d2b 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -11,7 +11,7 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * ----------------------------------------------------------------------------
- * RCS: @(#) $Id: nmakehlp.c,v 1.10 2007/12/13 15:28:52 dgp Exp $
+ * RCS: @(#) $Id: nmakehlp.c,v 1.11 2007/12/14 02:19:43 patthoyts Exp $
  * ----------------------------------------------------------------------------
  */
 
@@ -21,9 +21,15 @@
 #pragma comment (lib, "kernel32.lib")
 #include <stdio.h>
 #include <math.h>
+
+/*
+ * This library is required for x64 builds with _some_ versions
+ */
 #if defined(_M_IA64) || defined(_M_AMD64)
+#if _MSC_FULL_VER > 140000000 && _MSC_FULL_VER <= 140040310
 #pragma comment(lib, "bufferoverflowU")
 #endif
+#endif
 
 /* ISO hack for dumb VC++ */
 #ifdef _MSC_VER
-- 
cgit v0.12