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/configure.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/configure.in')
| -rw-r--r-- | win/configure.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/win/configure.in b/win/configure.in index 8dab534..d70066d 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.49.2.16 2005/11/16 22:07:39 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.49.2.17 2005/11/30 00:19:01 hobbs Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.13) @@ -196,6 +196,17 @@ else TK_RES='tk.$(RES)' fi +# The wish.exe.manifest requires these +# TK_WIN_VERSION is the 4 dotted pair Windows version format +case "$TK_PATCH_LEVEL" in + a*) TK_WIN_VERSION="$TK_VERSION.0.`echo $TK_PATCH_LEVEL | tr -d a`" ;; + b*) TK_WIN_VERSION="$TK_VERSION.1.`echo $TK_PATCH_LEVEL | tr -d b`" ;; + .*) TK_WIN_VERSION="$TK_VERSION.2$TK_PATCH_LEVEL" ;; +esac +AC_SUBST(TK_WIN_VERSION) +# X86|AMD64|IA64 for manifest +AC_SUBST(MACHINE) + AC_SUBST(TK_VERSION) AC_SUBST(TK_MAJOR_VERSION) AC_SUBST(TK_MINOR_VERSION) @@ -275,4 +286,4 @@ AC_SUBST(TK_BUILD_STUB_LIB_PATH) AC_SUBST(TK_CC_SEARCH_FLAGS) AC_SUBST(TK_LD_SEARCH_FLAGS) -AC_OUTPUT(Makefile tkConfig.sh) +AC_OUTPUT([Makefile tkConfig.sh wish.exe.manifest]) |