From 4ddd58307b04e25e740d0388a99d530cd18bf715 Mon Sep 17 00:00:00 2001 From: mdejong Date: Sat, 10 Dec 2005 01:38:09 +0000 Subject: * 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. --- ChangeLog | 8 ++++++++ win/configure | 3 +++ win/tcl.m4 | 3 +++ 3 files changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 06156a2..eb0900c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-12-09 Mo DeJong + + * 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. + 2005-12-09 Daniel Steffen * generic/tkInt.decls: move all platform test sources from tk lib into 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 -- cgit v0.12