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.in | |
| 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.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 a2e6c3b..8fdcd94 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.64 2005/12/01 02:03:58 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.65 2005/12/08 20:25:42 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -563,7 +563,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 @@ -622,7 +622,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 |