diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-04 11:02:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-04 11:02:33 (GMT) |
| commit | e949bfae939a0cae5a32415b32a1e60b36351ffa (patch) | |
| tree | 24cd06b1e308e3ec9c5c2bcd36d78460d504a2d9 /win/rules.vc | |
| parent | 2d3d61a110e7b0bb25fd02cc60e00098e1054565 (diff) | |
| parent | e583aab8c93cf6a1c2bd747295996e83667b6bf8 (diff) | |
| download | tcl-e949bfae939a0cae5a32415b32a1e60b36351ffa.zip tcl-e949bfae939a0cae5a32415b32a1e60b36351ffa.tar.gz tcl-e949bfae939a0cae5a32415b32a1e60b36351ffa.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'win/rules.vc')
| -rw-r--r-- | win/rules.vc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win/rules.vc b/win/rules.vc index 44e8704..b683651 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -1278,9 +1278,9 @@ OPTDEFINES = $(OPTDEFINES) -DTCL_MEM_DEBUG !if $(TCL_COMPILE_DEBUG)
OPTDEFINES = $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
!endif
-!if $(TCL_THREADS) && $(TCL_VERSION) <= 86
+!if $(TCL_THREADS) && $(TCL_VERSION) < 87
OPTDEFINES = $(OPTDEFINES) -DTCL_THREADS=1
-!if $(USE_THREAD_ALLOC)
+!if $(USE_THREAD_ALLOC) && $(TCL_VERSION) < 87
OPTDEFINES = $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
!endif
!endif
@@ -1751,6 +1751,9 @@ TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake" !if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"
!error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).
!endif
+!if $(TCL_VERSION) < 87 && defined(CORE_USE_THREAD_ALLOC) && $(CORE_USE_THREAD_ALLOC) != $(USE_THREAD_ALLOC)
+!message WARNING: Value of USE_THREAD_ALLOC ($(USE_THREAD_ALLOC)) does not match its Tcl core value ($(CORE_USE_THREAD_ALLOC)).
+!endif
!if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)
!message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)).
!endif
|