diff options
| author | hobbs <hobbs> | 2005-12-08 20:25:42 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2005-12-08 20:25:42 (GMT) |
| commit | f96cbf5fbbf47f81c5833879c39fe42b39f72c99 (patch) | |
| tree | 4c5edb21c5d07df5e1d3ed10230f507e40a1d11c /win/makefile.vc | |
| parent | 93ffd1d416a03cd792e06f5251092385ab67f788 (diff) | |
| download | tk-f96cbf5fbbf47f81c5833879c39fe42b39f72c99.zip tk-f96cbf5fbbf47f81c5833879c39fe42b39f72c99.tar.gz tk-f96cbf5fbbf47f81c5833879c39fe42b39f72c99.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]
* win/configure.in: Add CE build support (some C code fixes needed)
* win/wish.exe.manifest.in (new): manifest must map in MACHINE
* win/rc/wish.exe.manifest (removed): and VERSION to be correct.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 3fe87c1..8e63509 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.89 2005/03/08 21:55:49 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.90 2005/12/08 20:25:42 hobbs Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -113,7 +113,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 @@ -465,6 +465,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 guilibs = $(baselibs) gdi32.lib @@ -721,6 +726,22 @@ $(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c # Dedependency rules #--------------------------------------------------------------------- +$(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in + $(TCLSH) << +set f [open {$(WINDIR:\=/)/wish.exe.manifest.in} r] +set data [read $$f] +close $$f +set mach {$(MACHINE)} +if {[regexp -nocase {$(IX86)$$} $mach ]} {set mach X86} +set winver "$(DOTVERSION).0.0" +set data [string map [list @MACHINE@ $$mach @TK_WIN_VERSION@ $$winver] $$data] +puts {Creating $(TMP_DIR:\=/)/wish.exe.manifest} +set f [open {$(TMP_DIR:\=/)/wish.exe.manifest} w] +puts -nonewline $$f $$data +close $$f +exit +<< + $(TMP_DIR)\tk.res: \ $(RCDIR)\buttons.bmp \ $(RCDIR)\cursor*.cur \ @@ -794,12 +815,15 @@ $< << {$(RCDIR)}.rc{$(TMP_DIR)}.res: - $(rc32) -fo $@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \ + $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" $(TCL_INCLUDES) \ -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \ -d TCL_THREADS=$(TCL_THREADS) \ -d STATIC_BUILD=$(STATIC_BUILD) \ $< +$(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest +$(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest + .SUFFIXES: .SUFFIXES:.c .rc |