summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-12-02 11:02:34 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-12-02 11:02:34 (GMT)
commit7b5ffe4a2c27ceb9b41422abe0a3a680dc345244 (patch)
tree126f7977a1b577f5616897da0521ecc5833c70f9
parenta90dcf7e3dbae2714513cbc09ec978dfcf21aa55 (diff)
downloadtcl-7b5ffe4a2c27ceb9b41422abe0a3a680dc345244.zip
tcl-7b5ffe4a2c27ceb9b41422abe0a3a680dc345244.tar.gz
tcl-7b5ffe4a2c27ceb9b41422abe0a3a680dc345244.tar.bz2
Fix 64-bit MSVC build without SDK: If the MSVC version is recent enough, compiling without SDK works fine (provided that the build is configured using "--enable-64bit").
-rwxr-xr-xwin/configure12
-rw-r--r--win/tcl.m47
2 files changed, 6 insertions, 13 deletions
diff --git a/win/configure b/win/configure
index 63d6765..090feaa 100755
--- a/win/configure
+++ b/win/configure
@@ -3722,15 +3722,11 @@ echo "${ECHO_T}using shared flags" >&6
;;
esac
if test ! -d "${PATH64}" ; then
- { echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&5
-echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK to enable 64bit mode" >&2;}
- { echo "$as_me:$LINENO: WARNING: Ensure latest Platform SDK is installed" >&5
-echo "$as_me: WARNING: Ensure latest Platform SDK is installed" >&2;}
- do64bit="no"
- else
- echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5
-echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
+ { echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK" >&5
+echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK" >&2;}
fi
+ echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5
+echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
fi
LIBS="user32.lib advapi32.lib ws2_32.lib"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 2795086..006778c 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -815,12 +815,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
;;
esac
if test ! -d "${PATH64}" ; then
- AC_MSG_WARN([Could not find 64-bit $MACHINE SDK to enable 64bit mode])
- AC_MSG_WARN([Ensure latest Platform SDK is installed])
- do64bit="no"
- else
- AC_MSG_RESULT([ Using 64-bit $MACHINE mode])
+ AC_MSG_WARN([Could not find 64-bit $MACHINE SDK])
fi
+ AC_MSG_RESULT([ Using 64-bit $MACHINE mode])
fi
LIBS="user32.lib advapi32.lib ws2_32.lib"