summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-26 21:06:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-26 21:06:54 (GMT)
commitefdbc3f8c05ecc0ba68102a2701831532943961a (patch)
tree7aa40197ddd84b8c02ef2b1b999b5e65d17d66fa /win/tcl.m4
parent287331b62e1a63ddf1a687ca6f4679cc0ba053ea (diff)
downloadtk-efdbc3f8c05ecc0ba68102a2701831532943961a.zip
tk-efdbc3f8c05ecc0ba68102a2701831532943961a.tar.gz
tk-efdbc3f8c05ecc0ba68102a2701831532943961a.tar.bz2
enable cygwin build in /win directory (using mingw-w64 compiler)
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m430
1 files changed, 17 insertions, 13 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index 82bef11..796ae5f 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -462,18 +462,22 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
extra_ldflags="-pipe"
if test "$ac_cv_cygwin" = "yes"; then
- touch ac$$.c
- if ${CC} -c -mwin32 ac$$.c >/dev/null 2>&1; then
- case "$extra_cflags" in
- *-mwin32*) ;;
- *) extra_cflags="-mwin32 $extra_cflags" ;;
- esac
- case "$extra_ldflags" in
- *-mwin32*) ;;
- *) extra_ldflags="-mwin32 $extra_ldflags" ;;
+ case "$do64bit" in
+ amd64|x64|yes)
+ CC="x86_64-w64-mingw32-gcc"
+ LD="x86_64-w64-mingw32-ld"
+ AR="x86_64-w64-mingw32-ar"
+ RANLIB="x86_64-w64-mingw32-ranlib"
+ RC="x86_64-w64-mingw32-windres"
+ ;;
+ *)
+ CC="i686-w64-mingw32-gcc"
+ LD="i686-w64-mingw32-ld"
+ AR="i686-w64-mingw32-ar"
+ RANLIB="i686-w64-mingw32-ranlib"
+ RC="i686-w64-mingw32-windres"
+ ;;
esac
- fi
- rm -f ac$$.o ac$$.c
fi
if test "${SHARED_BUILD}" = "0" ; then
@@ -918,8 +922,8 @@ AC_DEFUN([SC_EMBED_MANIFEST], [
[ --enable-embedded-manifest embed manifest if possible (default: yes)],
[embed_ok=$enableval], [embed_ok=yes])
- VC_MANIFEST_EMBED_DLL=
- VC_MANIFEST_EMBED_EXE=
+ VC_MANIFEST_EMBED_DLL=
+ VC_MANIFEST_EMBED_EXE=
result=no
if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \
-a "$GCC" != "yes" ; then