summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authormdejong <mdejong>2005-12-10 01:38:09 (GMT)
committermdejong <mdejong>2005-12-10 01:38:09 (GMT)
commit4ddd58307b04e25e740d0388a99d530cd18bf715 (patch)
tree8a6ad66f092c9afec03532ba225c805889d3b7cb /win
parenteeef28e57a775d4290fcc11d968af58b50830a0d (diff)
downloadtk-4ddd58307b04e25e740d0388a99d530cd18bf715.zip
tk-4ddd58307b04e25e740d0388a99d530cd18bf715.tar.gz
tk-4ddd58307b04e25e740d0388a99d530cd18bf715.tar.bz2
* win/configure: Regen.
* win/tcl.m4 (SC_CONFIG_CFLAGS): Define MACHINE for gcc builds. The lack of a definition of this variable in the manifest file was causing a runtime error in wish built with gcc.
Diffstat (limited to 'win')
-rwxr-xr-xwin/configure3
-rw-r--r--win/tcl.m43
2 files changed, 6 insertions, 0 deletions
diff --git a/win/configure b/win/configure
index 3f077f3..8e28945 100755
--- a/win/configure
+++ b/win/configure
@@ -2842,6 +2842,9 @@ echo "$as_me: error: ${CC} does not support the -shared option.
#LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}"
LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
+
+ # gcc under Windows supports only 32bit builds
+ MACHINE="X86"
else
if test "${SHARED_BUILD}" = "0" ; then
# static
diff --git a/win/tcl.m4 b/win/tcl.m4
index e0598bc..b37c626 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -552,6 +552,9 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
#LDFLAGS_WINDOW="-mwindows -e _WinMain@16 ${extra_ldflags}"
LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}"
LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
+
+ # gcc under Windows supports only 32bit builds
+ MACHINE="X86"
else
if test "${SHARED_BUILD}" = "0" ; then
# static