diff options
| author | hobbs <hobbs> | 2005-12-08 20:20:31 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2005-12-08 20:20:31 (GMT) |
| commit | 9a0b2f10b4c17659126642ca9fd595b75464d292 (patch) | |
| tree | fe88a4206ae9725bedb9edc971c8ff90e15c52f7 /win/makefile.vc | |
| parent | beb1e767c6d1b56803decc299a1046cbe27a1687 (diff) | |
| download | tcl-9a0b2f10b4c17659126642ca9fd595b75464d292.zip tcl-9a0b2f10b4c17659126642ca9fd595b75464d292.tar.gz tcl-9a0b2f10b4c17659126642ca9fd595b75464d292.tar.bz2 | |
* win/Makefile.in, win/makefile.vc: Add Win x64 and CE build support
* win/tcl.m4, win/configure: CE still requires C code fixes.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index d74f505..c5763ad 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.141 2005/11/03 00:17:31 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.142 2005/12/08 20:20:37 hobbs Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -111,7 +111,7 @@ the build instructions. # fullwarn = Builds with full compiler and link warnings enabled. # Very verbose. # -# MACHINE=(IX86|IA64|ALPHA) +# MACHINE=(IX86|IA64|AMD64|ALPHA) # Set the machine type used for the compiler, linker, and # resource compiler. This hook is needed to tell the tools # when alternate platforms are requested. IX86 is the default @@ -515,7 +515,11 @@ conlflags = $(lflags) -subsystem:console guilflags = $(lflags) -subsystem:windows 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" +baselibs = $(baselibs) bufferoverflowU.lib +!endif #--------------------------------------------------------------------- # TclTest flags |