diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-09-23 16:37:06 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-09-23 16:37:06 (GMT) |
| commit | 773fea02280ffb98f9d79bec83e4121e92f1be28 (patch) | |
| tree | 96bb15abcaf084d545a65c64ebc9da85434da8ae /win/makefile.vc | |
| parent | 4e12c83774ba3d73e4970089e9c04a886bdbae94 (diff) | |
| parent | e52bf0ecd422e64401d71475c5995f18c49c8561 (diff) | |
| download | tcl-bug_e0a7b3e5f8.zip tcl-bug_e0a7b3e5f8.tar.gz tcl-bug_e0a7b3e5f8.tar.bz2 | |
merge 8.5bug_e0a7b3e5f8
Diffstat (limited to 'win/makefile.vc')
| -rw-r--r-- | win/makefile.vc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 1f957ea..267f53f 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -480,6 +480,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
@@ -504,6 +508,9 @@ baselibs = kernel32.lib user32.lib ws2_32.lib baselibs = $(baselibs) bufferoverflowU.lib
!endif
!endif
+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
+baselibs = $(baselibs) ucrt.lib
+!endif
#---------------------------------------------------------------------
# TclTest flags
|