diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-25 09:39:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-25 09:39:16 (GMT) |
| commit | 2974c8e22c848bf702dd9db29fbc7e1e9b10160c (patch) | |
| tree | e7e7e248cb6d7d070edc41b67bf00f9bcdc9fb40 /win/makefile.vc | |
| parent | 9f8346d54f1ce71d31c76d3181ca37bb6708bf7a (diff) | |
| download | tcl-2974c8e22c848bf702dd9db29fbc7e1e9b10160c.zip tcl-2974c8e22c848bf702dd9db29fbc7e1e9b10160c.tar.gz tcl-2974c8e22c848bf702dd9db29fbc7e1e9b10160c.tar.bz2 | |
Removed "ucrt" as configureable option: If building with VC2014, it's the recommended way to build Tcl.
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 24a92ba..267f53f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -70,7 +70,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,static,staticpkg,symbols,threads,profile,unchecked,ucrt,none
+# OPTS=loimpact,msvcrt,static,staticpkg,symbols,threads,profile,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.
@@ -94,11 +94,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
@@ -443,13 +438,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
@@ -491,7 +480,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
@@ -519,7 +508,7 @@ baselibs = kernel32.lib user32.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
|