diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-15 12:43:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-06-15 12:43:17 (GMT) |
| commit | c024f79ece03d622d5773eea38a2516f801a402a (patch) | |
| tree | 69e4e224ec3381ba4f9a5ef47b6c7607105822c5 | |
| parent | 84e4abc973bb01148af753139241f25270a6149b (diff) | |
| parent | 1de8df2918a1ec394d2a90e337cf537b47a886c9 (diff) | |
| download | tcl-c024f79ece03d622d5773eea38a2516f801a402a.zip tcl-c024f79ece03d622d5773eea38a2516f801a402a.tar.gz tcl-c024f79ece03d622d5773eea38a2516f801a402a.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | win/Makefile.in | 2 | ||||
| -rw-r--r-- | win/rules.vc | 10 | ||||
| -rw-r--r-- | win/tclWinPort.h | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 075e08c..ffc9285 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -254,7 +254,7 @@ ZIP_INSTALL_OBJS = @ZIP_INSTALL_OBJS@ CC_SWITCHES = -I"${GENERIC_DIR_NATIVE}" -I"${TOMMATH_DIR_NATIVE}" \ -I"${ZLIB_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \ -${CFLAGS} ${CFLAGS_WARNING} ${TCL_SHLIB_CFLAGS} -DMP_PREC=4 \ +${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} -DMP_PREC=4 \ ${AC_FLAGS} ${COMPILE_DEBUG_FLAGS} ${NO_DEPRECATED_FLAGS} CC_OBJNAME = @CC_OBJNAME@ diff --git a/win/rules.vc b/win/rules.vc index bb78cb5..a4aeca1 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -730,11 +730,8 @@ MSVCRT = 0 !else
!if [nmakehlp -f $(OPTS) "msvcrt"]
!message *** Doing msvcrt
-MSVCRT = 1
-!else
-!if !$(STATIC_BUILD)
-MSVCRT = 1
!else
+!if $(STATIC_BUILD)
MSVCRT = 0
!endif
!endif
@@ -743,17 +740,12 @@ MSVCRT = 0 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
!message *** Doing staticpkg
TCL_USE_STATIC_PACKAGES = 1
-!else
-TCL_USE_STATIC_PACKAGES = 0
!endif
!if [nmakehlp -f $(OPTS) "nothreads"]
!message *** Compile explicitly for non-threaded tcl
TCL_THREADS = 0
USE_THREAD_ALLOC= 0
-!else
-TCL_THREADS = 1
-USE_THREAD_ALLOC= 1
!endif
!if "$(TCL_MAJOR_VERSION)" == "8"
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index edbdbdd..1aaf21d 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -14,7 +14,6 @@ #ifndef _TCLWINPORT #define _TCLWINPORT - #if !defined(_WIN64) && !defined(__MINGW_USE_VC2005_COMPAT) /* See [Bug 3354324]: file mtime sets wrong time */ # define __MINGW_USE_VC2005_COMPAT @@ -27,7 +26,7 @@ /* * We must specify the lower version we intend to support. * - * WINVER = 0x0500 means Windows 2000 and above + * WINVER = 0x0501 means Windows XP and above */ #ifndef WINVER |