summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-12-03 09:21:21 (GMT)
committernijtmans <nijtmans>2010-12-03 09:21:21 (GMT)
commit2902ae62d2886fb1fb840383a4c22caa29d4da2d (patch)
tree7410d0bb2ad14a53d04dcaeaf432c1ed4ba5e7d7
parent2cf343c2d3e62d0a052e9d8e7251b1c53d5b6ad3 (diff)
downloadtk-2902ae62d2886fb1fb840383a4c22caa29d4da2d.zip
tk-2902ae62d2886fb1fb840383a4c22caa29d4da2d.tar.gz
tk-2902ae62d2886fb1fb840383a4c22caa29d4da2d.tar.bz2
[Patch #3116490] cross-compile Tk mingw32 on unix.
This makes it possible to cross-compile Tcl/Tk for Windows (either 32-bit or 64-bit) out-of-the-box on UNIX, using mingw-w64 build tools.
-rw-r--r--ChangeLog7
-rwxr-xr-xwin/configure4
-rw-r--r--win/tcl.m43
3 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d8297a2..4569eb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-03 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * win/tcl.m4 [Patch #3116490] cross-compile Tcl mingw32 on unix
+ * win/configure This makes it possible to cross-compile Tcl/Tk for
+ Windows (either 32-bit or 64-bit) out-of-the-box on UNIX, using mingw-w64
+ build tools.
+
2010-12-02 Donal K. Fellows <dkf@users.sf.net>
* generic/tkInt.decls (TkDrawAngledTextLayout,TkDrawAngledChars,...):
diff --git a/win/configure b/win/configure
index 75fb712..922c8b9 100755
--- a/win/configure
+++ b/win/configure
@@ -3388,10 +3388,6 @@ file for information about building with Mingw." >&2;}
echo "$as_me:$LINENO: checking compiler flags" >&5
echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
if test "${GCC}" = "yes" ; then
- if test "$do64bit" != "no" ; then
- { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on Windows" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on Windows" >&2;}
- fi
SHLIB_LD=""
SHLIB_LD_LIBS='${LIBS}'
LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 88ec090..c24171c 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -458,9 +458,6 @@ file for information about building with Mingw.])
AC_MSG_CHECKING([compiler flags])
if test "${GCC}" = "yes" ; then
- if test "$do64bit" != "no" ; then
- AC_MSG_WARN([64bit mode not supported with GCC on Windows])
- fi
SHLIB_LD=""
SHLIB_LD_LIBS='${LIBS}'
LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32"