diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-25 14:07:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-25 14:07:11 (GMT) |
| commit | 4e778d0112fb867161ef4b24103c493e73ce757b (patch) | |
| tree | 198d06f68805ded1e3198b14e62243835ab9b1ed /win | |
| parent | 50a8e5953a346e641c8c8b10fe1bb5010f26c1dc (diff) | |
| parent | 5d964e0e6cf53fdbfb627ec0846131dae369f644 (diff) | |
| download | tcl-4e778d0112fb867161ef4b24103c493e73ce757b.zip tcl-4e778d0112fb867161ef4b24103c493e73ce757b.tar.gz tcl-4e778d0112fb867161ef4b24103c493e73ce757b.tar.bz2 | |
merge trunk
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 7 | ||||
| -rwxr-xr-x | win/tclWinFile.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index be05e73..024ecb0 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -530,6 +530,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
@@ -554,6 +558,9 @@ baselibs = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib baselibs = $(baselibs) bufferoverflowU.lib
!endif
!endif
+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
+baselibs = $(baselibs) ucrt.lib
+!endif
#---------------------------------------------------------------------
# TclTest flags
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 6b9d373..02927ad 100755 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -3001,7 +3001,7 @@ TclNativeCreateNativeRep( } done: - + TclDecrRefCount(validPathPtr); return nativePathPtr; } |