diff options
author | nijtmans <nijtmans> | 2010-12-13 21:23:59 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-12-13 21:23:59 (GMT) |
commit | 716be31fd7cb8acae5bba8b10425b904f8ace0dc (patch) | |
tree | b2163166f4f1a1b642799c861fc05ecf29b4d279 /win/configure | |
parent | 899c51483b58eceb78b4fc34ae8b0c6ff59d8db6 (diff) | |
download | tk-716be31fd7cb8acae5bba8b10425b904f8ace0dc.zip tk-716be31fd7cb8acae5bba8b10425b904f8ace0dc.tar.gz tk-716be31fd7cb8acae5bba8b10425b904f8ace0dc.tar.bz2 |
Cross-compile support for Win and UNIX (backported)
Diffstat (limited to 'win/configure')
-rwxr-xr-x | win/configure | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/win/configure b/win/configure index dec3ff5..ebb3eb5 100755 --- a/win/configure +++ b/win/configure @@ -3390,10 +3390,6 @@ echo "${ECHO_T}yes" >&6 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="-lws2_32" @@ -3501,8 +3497,11 @@ echo "$as_me: error: ${CC} does not support the -shared option. LDFLAGS_CONSOLE="-mconsole ${extra_ldflags}" LDFLAGS_WINDOW="-mwindows ${extra_ldflags}" - # gcc under Windows supports only 32bit builds - MACHINE="X86" + if test "$do64bit" != "no" ; then + MACHINE="AMD64" + else + MACHINE="X86" + fi else if test "${SHARED_BUILD}" = "0" ; then # static |