summaryrefslogtreecommitdiffstats
path: root/win/configure.in
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-12-08 20:25:42 (GMT)
committerhobbs <hobbs>2005-12-08 20:25:42 (GMT)
commitf96cbf5fbbf47f81c5833879c39fe42b39f72c99 (patch)
tree4c5edb21c5d07df5e1d3ed10230f507e40a1d11c /win/configure.in
parent93ffd1d416a03cd792e06f5251092385ab67f788 (diff)
downloadtk-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/configure.in')
-rw-r--r--win/configure.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/win/configure.in b/win/configure.in
index 8310ef6..c5b5e76 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.61 2005/08/23 18:25:34 mdejong Exp $
+# RCS: @(#) $Id: configure.in,v 1.62 2005/12/08 20:25:42 hobbs Exp $
AC_INIT(../generic/tk.h)
AC_PREREQ(2.59)
@@ -221,6 +221,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)
@@ -295,4 +306,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])