Update to tk 8.5.19

win/makefile.vc

@@ -42,7 +42,7 @@ the build instructions.
 #     turn on the 64-bit compiler, if your SDK has it.
 #
 # 3)  Targets are:
-#	release  -- Builds the core, the shell. (default)
+#	release  -- Builds the core, the shell and the dlls. (default)
 #	dlls     -- Just builds the windows extensions.
 #	shell    -- Just builds the shell and the core.
 #	core     -- Only builds the core [tkXX.(dll|lib)].
@@ -443,7 +443,7 @@ cdebug	= $(OPTIMIZATIONS)
 cdebug	=
 !endif
 !if $(SYMBOLS)
-cdebug = $(cdebug) -Zi
+cdebug	= $(cdebug) -Zi
 !endif
 !else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
 ### Warnings are too many, can't support warnings into errors.
@@ -476,6 +476,7 @@ CON_CFLAGS	= $(cdebug) $(cflags) $(crt) -DCONSOLE
 WISH_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES)
 STUB_CFLAGS     = $(cflags) $(cdebug) $(TK_DEFINES)
 
+
 #---------------------------------------------------------------------
 # Link flags
 #---------------------------------------------------------------------
@@ -496,6 +497,10 @@ lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
 lflags	= $(lflags) -profile
 !endif
 
+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
+lflags	= $(lflags) -nodefaultlib:libucrt.lib
+!endif
+
 !if $(ALIGN98_HACK) && !$(STATIC_BUILD)
 ### Align sections for PE size savings.
 lflags	= $(lflags) -opt:nowin98
@@ -520,6 +525,10 @@ baselibs   = kernel32.lib user32.lib
 baselibs   = $(baselibs) bufferoverflowU.lib
 !endif
 !endif
+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
+baselibs   = $(baselibs) ucrt.lib
+!endif
+
 guilibs	  = $(baselibs) gdi32.lib
 
 
@@ -648,7 +657,7 @@ $**
 
 
 $(TKSTUBLIB): $(TKSTUBOBJS)
-	$(lib32) -nologo -out:$@ $**
+	$(lib32) -nologo -nodefaultlib -out:$@ $**
 
 
 $(WISH): $(WISHOBJS) $(TKIMPLIB)
@@ -1026,4 +1035,3 @@ realclean: hose
 hose:
 	@echo Hosing $(OUT_DIR)\* ...
 	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)
-