diff options
| author | dgp <dgp@users.sourceforge.net> | 2008-01-23 16:42:15 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2008-01-23 16:42:15 (GMT) |
| commit | c93ca3534a26772f8acc81f3432c1bc74da5c701 (patch) | |
| tree | 5fa5c50aa0b980fc25477f158eea2a756922fadd /win/makefile.vc | |
| parent | 8399b253ca7479b09d5d05ce4e81a9c9697a3582 (diff) | |
| download | tcl-c93ca3534a26772f8acc81f3432c1bc74da5c701.zip tcl-c93ca3534a26772f8acc81f3432c1bc74da5c701.tar.gz tcl-c93ca3534a26772f8acc81f3432c1bc74da5c701.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 760e3f7..3fda014 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.160.2.8 2007/12/04 16:55:55 dgp Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.160.2.9 2008/01/23 16:42:26 dgp Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -480,8 +480,10 @@ baselibs = kernel32.lib user32.lib ws2_32.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 #--------------------------------------------------------------------- # TclTest flags |