diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2015-12-02 11:30:36 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2015-12-02 11:30:36 (GMT) |
| commit | 88fcfcf3e65130717d51c950c9361fc0541c8c16 (patch) | |
| tree | 95785420b6e35092d9a998e6dedf30bf8219df86 | |
| parent | 3ef0ca053eb1bfbb53a49dce0e392f4d7bb708e3 (diff) | |
| parent | e4c96d6415fe35a82c1e2c50c28612cfa195a013 (diff) | |
| download | tcl-88fcfcf3e65130717d51c950c9361fc0541c8c16.zip tcl-88fcfcf3e65130717d51c950c9361fc0541c8c16.tar.gz tcl-88fcfcf3e65130717d51c950c9361fc0541c8c16.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").
FossilOrigin-Name: 6b5e1dd52cdb130a14287c9dd85ad069279bff85
| -rwxr-xr-x | win/configure | 12 | ||||
| -rw-r--r-- | win/tcl.m4 | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/win/configure b/win/configure index decb902..3ebc697 100755 --- a/win/configure +++ b/win/configure @@ -3792,15 +3792,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="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib" @@ -826,12 +826,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="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib" |