diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2007-12-14 02:19:42 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2007-12-14 02:19:42 (GMT) |
| commit | 1e2cc34c8fe57acaaf8376477933f36338c316c2 (patch) | |
| tree | 6079e75cbcc6a15de42e7ea8f71c120521d01ab7 /win | |
| parent | 7fd2d51229f0e0f817966bb438485c2a2067b52a (diff) | |
| download | tk-1e2cc34c8fe57acaaf8376477933f36338c316c2.zip tk-1e2cc34c8fe57acaaf8376477933f36338c316c2.tar.gz tk-1e2cc34c8fe57acaaf8376477933f36338c316c2.tar.bz2 | |
Support compilation with MSVC9 on AMD64
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 4 | ||||
| -rw-r--r-- | win/nmakehlp.c | 8 |
2 files changed, 10 insertions, 2 deletions
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 |