Removed "ucrt" as configureable option: If building with VC2014, it's the recommended way to build Tcl.

2 files changed, 4 insertions, 22 deletions

diff --git a/win/makefile.vc b/win/makefile.vc
index 4a19d89..024ecb0 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -71,7 +71,7 @@ the build instructions.
 #		Sets where to install Tcl from the built binaries.

 #		C:\Progra~1\Tcl is assumed when not specified.

 #

-#	OPTS=loimpact,msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,tclalloc,unchecked,ucrt,none

+#	OPTS=loimpact,msvcrt,nothreads,pdbs,profile,static,staticpkg,symbols,thrdalloc,tclalloc,unchecked,none

 #		Sets special options for the core.  The default is for none.

 #		Any combination of the above may be used (comma separated).

 #		'none' will over-ride everything to nothing.

@@ -102,11 +102,6 @@ the build instructions.
 #		unchecked= Allows a symbols build to not use the debug

 #			   enabled runtime (msvcrt.dll not msvcrtd.dll

 #			   or libcmt.lib not libcmtd.lib).

-#		ucrt= Uses ucrt.lib and libvcruntime.lib, which

-#			   ensures Tcl will run on machines with only the subset

-#			   of the C runtime that is part of the operating system.

-#			   If omitted, builds with VC 14.0 or later will require

-#			   the full C runtime redistributable.

 #

 #	STATS=compdbg,memdbg,none

 #		Sets optional memory and bytecode compiler debugging code added

@@ -493,13 +488,7 @@ cdebug	= -Zi -WX $(DEBUGFLAGS)
 cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE

 cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\

 

-!if $(UCRT)

-!if $(DEBUG) && !$(UNCHECKED)

-crt = -MDd

-!else

-crt = -MT

-!endif

-!elseif $(MSVCRT)

+!if $(MSVCRT)

 !if $(DEBUG) && !$(UNCHECKED)

 crt = -MDd

 !else

@@ -541,7 +530,7 @@ lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
 lflags	= $(lflags) -profile

 !endif

 

-!if $(UCRT) && !($(DEBUG) && !$(UNCHECKED))

+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

 lflags	= $(lflags) -nodefaultlib:libucrt.lib

 !endif

 

@@ -569,7 +558,7 @@ baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
 baselibs   = $(baselibs) bufferoverflowU.lib

 !endif

 !endif

-!if $(UCRT) && !($(DEBUG) && !$(UNCHECKED))

+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900

 baselibs   = $(baselibs) ucrt.lib

 !endif

 

diff --git a/win/rules.vc b/win/rules.vc
index bc36dc9..d4c2f35 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -223,7 +223,6 @@ LOIMPACT	= 0
 TCL_USE_STATIC_PACKAGES	= 0

 USE_THREAD_ALLOC = 1

 UNCHECKED	= 0

-UCRT		= 0

 !else

 !if [nmakehlp -f $(OPTS) "static"]

 !message *** Doing static

@@ -303,12 +302,6 @@ UNCHECKED = 1
 UNCHECKED = 0

 !endif

 !endif

-!if [nmakehlp -f $(OPTS) "ucrt"] && $(VCVERSION) >= 1900

-!message *** Doing UCRT

-UCRT = 1

-!else

-UCRT = 0

-!endif

 

 #----------------------------------------------------------

 # Figure-out how to name our intermediate and output directories.