diff options
| author | hobbs <hobbs> | 2009-02-17 18:08:13 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2009-02-17 18:08:13 (GMT) |
| commit | 5f6476a428fc30fda30e4fda02662e190aa73ada (patch) | |
| tree | c6cce8fb2ffb251b5ed94c9005a181d4b19bc8c5 /win/tcl.m4 | |
| parent | 56d83775505d9df99e7ba9bb237ed23d8d23c5ec (diff) | |
| download | tk-5f6476a428fc30fda30e4fda02662e190aa73ada.zip tk-5f6476a428fc30fda30e4fda02662e190aa73ada.tar.gz tk-5f6476a428fc30fda30e4fda02662e190aa73ada.tar.bz2 | |
* win/tcl.m4, win/configure: Check if cl groks _WIN64 already to
avoid CC manipulation that can screw up later configure checks.
Use 'd'ebug runtime in 64-bit builds.
Diffstat (limited to 'win/tcl.m4')
| -rw-r--r-- | win/tcl.m4 | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -619,8 +619,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # The space-based-path will work for the Makefile, but will # not work if AC_TRY_COMPILE is called. TEA has the # TEA_PATH_NOSPACE to avoid this issue. - CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \ - -I\"${MSSDK}/Include/crt\" -I\"${MSSDK}/Include/crt/sys\"" + # Check if _WIN64 is already recognized, and if so we don't + # need to modify CC. + AC_CHECK_DECL([_WIN64], [], + [CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \ + -I\"${MSSDK}/Include/crt\" \ + -I\"${MSSDK}/Include/crt/sys\""]) RC="\"${MSSDK}/bin/rc.exe\"" CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d" # Do not use -O2 for Win64 - this has proved buggy in code gen. @@ -747,6 +751,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ MAKE_EXE="\${CC} -Fe\[$]@" LIBPREFIX="" + CFLAGS_DEBUG="${CFLAGS_DEBUG} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" + CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE" + EXTRA_CFLAGS="" CFLAGS_WARNING="-W3" LDFLAGS_DEBUG="-debug:full" |