diff options
| author | hobbs <hobbs> | 2005-11-30 00:19:01 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2005-11-30 00:19:01 (GMT) |
| commit | 0805428fc70c423c555452caba933228486c7c5d (patch) | |
| tree | e93af74ffc560c427f348a51fef41a992ed9136d /win/makefile.vc | |
| parent | c74cc400ab2d9838a5a39b9b39101e005bf97f47 (diff) | |
| download | tk-0805428fc70c423c555452caba933228486c7c5d.zip tk-0805428fc70c423c555452caba933228486c7c5d.tar.gz tk-0805428fc70c423c555452caba933228486c7c5d.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:
* 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 | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index b8d6c91..cfb133a 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.67.2.9 2005/03/08 21:54:01 hobbs Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.67.2.10 2005/11/30 00:19:01 hobbs Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -440,6 +440,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 guilibs = $(baselibs) shell32.lib gdi32.lib comdlg32.lib winspool.lib imm32.lib comctl32.lib @@ -723,6 +728,21 @@ $(TMP_DIR)\tkStubImg.obj : $(GENERICDIR)\tkStubImg.c # Dedependency rules #--------------------------------------------------------------------- +$(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in + $(TCLSH) << +puts "Creating wish.exe.manifest ..." +set f [open "$(WINDIR:\=/)/wish.exe.manifest.in" r] +set data [read $$f] +close $$f +set f [open "$(TMPDIR:\=/)/wish.exe.manifest" w] +set mach "$(MACHINE)" +if {[regexp -nocase {^(|IX86)$$} $$mach]} { set mach "X86" } +# Exact version is not critical in the manifest +set winver "$(DOTVERSION).0.0" +puts $$f -nonewline [string map [list @MACHINE@ $$mach @TK_WIN_VERSION@ $$winver] $$data] +close $$f +<< + $(TMP_DIR)\tk.res: \ $(RCDIR)\buttons.bmp \ $(RCDIR)\cursor*.cur \ @@ -794,7 +814,7 @@ $< $< << -{$(RCDIR)}.rc{$(TMP_DIR)}.res: +{$(RCDIR)}.rc{$(TMP_DIR)}.res: $(TMP_DIR)\wish.exe.manifest $(rc32) -fo $@ -r -i "$(GENERICDIR)" $(TCL_INCLUDES) \ !if $(DEBUG) -d DEBUG \ |