diff options
author | nijtmans <nijtmans> | 2010-12-10 15:47:36 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-12-10 15:47:36 (GMT) |
commit | f28251ef2b768bf8e0d78f9aaa717d64b01edadf (patch) | |
tree | 3df52024b7c05ea0cfc44bb97d9f9f3f2bf7d5ec /win | |
parent | 145990da784cdcc5cad752ea8a9b6c9d7993a4a5 (diff) | |
download | tk-f28251ef2b768bf8e0d78f9aaa717d64b01edadf.zip tk-f28251ef2b768bf8e0d78f9aaa717d64b01edadf.tar.gz tk-f28251ef2b768bf8e0d78f9aaa717d64b01edadf.tar.bz2 |
Fix manifest-generation for 64-bit gcc (mingw-w64)
Diffstat (limited to 'win')
-rwxr-xr-x | win/configure | 7 | ||||
-rw-r--r-- | win/tcl.m4 | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/win/configure b/win/configure index 922c8b9..e5b5ef7 100755 --- a/win/configure +++ b/win/configure @@ -3558,8 +3558,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 @@ -575,8 +575,11 @@ file for information about building with Mingw.]) 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 |