1 files changed, 29 insertions, 2 deletions
diff --git a/win/rules.vc b/win/rules.vc
index b125047..d7431ef 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -746,6 +746,15 @@ TCL_USE_STATIC_PACKAGES	= 1
 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 [nmakehlp -f $(OPTS) "time64bit"]
 !message *** Force 64-bit time_t
 _USE_64BIT_TIME_T = 1
@@ -793,6 +802,12 @@ PGO		= 0
 !message *** Warning: ignoring option "loimpact" - deprecated on modern Windows.
 !endif
 
+# TBD - should get rid of this option
+!if [nmakehlp -f $(OPTS) "thrdalloc"]
+!message *** Doing thrdalloc
+USE_THREAD_ALLOC = 1
+!endif
+
 !if [nmakehlp -f $(OPTS) "tclalloc"]
 USE_THREAD_ALLOC = 0
 !endif
@@ -1337,11 +1352,11 @@ OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_PROFILED
 OPTDEFINES	= $(OPTDEFINES) /DTCL_CFG_DO64BIT
 !endif
 !if $(VCVERSION) < 1300
-OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64
+OPTDEFINES	= $(OPTDEFINES) /DNO_STRTOI64=1
 !endif
 
 !if "$(_USE_64BIT_TIME_T)" == "1"
-OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T
+OPTDEFINES	= $(OPTDEFINES) /D_USE_64BIT_TIME_T=1
 !endif
 !if "$(TCL_UTF_MAX)" == "6"
 OPTDEFINES	= $(OPTDEFINES) /DTCL_UTF_MAX=4
@@ -1473,6 +1488,18 @@ lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
 lflags	= $(lflags) -nodefaultlib:libucrt.lib
 !endif
 
+# Old linkers (Visual C++ 6 in particular) will link for fast loading
+# on Win98. Since we do not support Win98 any more, we specify nowin98
+# as recommended for NT and later. However, this is only required by
+# IX86 on older compilers and only needed if we are not doing a static build.
+
+!if "$(MACHINE)" == "IX86" && !$(STATIC_BUILD)
+!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]
+# Align sections for PE size savings.
+lflags	= $(lflags) -opt:nowin98
+!endif
+!endif
+
 dlllflags = $(lflags) -dll
 conlflags = $(lflags) -subsystem:console
 guilflags = $(lflags) -subsystem:windows