summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-12-03 15:51:07 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-12-03 15:51:07 (GMT)
commit3c354d91432f5a951efb12e957299cacdeafb897 (patch)
tree323ece4e17f57a153846860eb27c003b35b4e461
parent29fa1d125581718f5ece85fb7cce4901faf99127 (diff)
parent7f2c3a3f39d6a76f0656cbffc7e589b1a59bc346 (diff)
downloadtk-3c354d91432f5a951efb12e957299cacdeafb897.zip
tk-3c354d91432f5a951efb12e957299cacdeafb897.tar.gz
tk-3c354d91432f5a951efb12e957299cacdeafb897.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 64aea44..18efa23 100755
--- a/win/configure
+++ b/win/configure
@@ -3941,15 +3941,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"
diff --git a/win/tcl.m4 b/win/tcl.m4
index db86f6c..84f0dff 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -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"