summaryrefslogtreecommitdiffstats
path: root/win/makefile.vc
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-11-30 00:15:35 (GMT)
committerhobbs <hobbs>2005-11-30 00:15:35 (GMT)
commit08315becbe85b5742b61c005317cc4586a8272b4 (patch)
tree7a34312c78af88bec60c628ccad0bbbccff6791f /win/makefile.vc
parent78e4bd756c392b75621c7d8c46d00a7cc2c03701 (diff)
downloadtcl-08315becbe85b5742b61c005317cc4586a8272b4.zip
tcl-08315becbe85b5742b61c005317cc4586a8272b4.tar.gz
tcl-08315becbe85b5742b61c005317cc4586a8272b4.tar.bz2
* win/tcl.m4: Add build support for Windows-x64 builds.
* win/configure: --enable-64bit now accepts =amd64|ia64 for * win/Makefile.in: Windows 64-bit build variants (default: amd64) * win/makefile.vc: [Bug 1369597]
Diffstat (limited to 'win/makefile.vc')
-rw-r--r--win/makefile.vc8
1 files changed, 6 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 31b5b67..7b8fe5f 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
# Copyright (c) 2001-2002 David Gravereaux.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.100.2.6 2005/03/08 21:50:37 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.100.2.7 2005/11/30 00:15:39 hobbs Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -399,7 +399,11 @@ conlflags = $(lflags) -subsystem:console
guilflags = $(lflags) -subsystem:windows
baselibs = kernel32.lib advapi32.lib user32.lib
-
+# Avoid 'unresolved external symbol __security_cookie' errors.
+# c.f. http://support.microsoft.com/?id=894573
+!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+baselibs = $(baselibs) bufferoverflowU.lib
+!endif
#---------------------------------------------------------------------
# TclTest flags