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.in | |
| 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.in')
| -rw-r--r-- | win/Makefile.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index fe3ab8e..c346c5a 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.59.2.1 2005/07/25 01:33:54 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.59.2.2 2005/11/30 00:19:01 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -535,7 +535,7 @@ cat32.${OBJEXT}: $(TCL_SRC_DIR)/win/cat.c $(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME) $(CAT32): cat32.${OBJEXT} - $(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LDFLAGS_CONSOLE) + $(CC) $(CFLAGS) cat32.$(OBJEXT) $(CC_EXENAME) $(LIBS) $(LDFLAGS_CONSOLE) # The following targets are configured by autoconf to generate either # a shared library or static library @@ -597,7 +597,8 @@ clean: cleanhelp $(RM) *.pch *.ilk *.pdb distclean: clean - $(RM) Makefile config.status config.cache config.log tkConfig.sh + $(RM) Makefile config.status config.cache config.log tkConfig.sh \ + wish.exe.manifest Makefile: $(SRC_DIR)/Makefile.in ./config.status |