summaryrefslogtreecommitdiffstats
path: root/win/rules.vc
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-26 09:10:35 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-26 09:10:35 (GMT)
commitfd93cadcf5c47961179aaaf12f13cfdcaa391c7f (patch)
tree920d79e1791f448186e3342ebc83a8ebabf6b62d /win/rules.vc
parente6cf6979cb99a3488a2895f723fb97914397b132 (diff)
parent098fae735aadcba5814ce789a31e46582366dee8 (diff)
downloadtcl-fd93cadcf5c47961179aaaf12f13cfdcaa391c7f.zip
tcl-fd93cadcf5c47961179aaaf12f13cfdcaa391c7f.tar.gz
tcl-fd93cadcf5c47961179aaaf12f13cfdcaa391c7f.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'win/rules.vc')
-rw-r--r--win/rules.vc5
1 files changed, 5 insertions, 0 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 30e8c2f..e12854d 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -230,6 +230,10 @@ STATIC_BUILD = 1
!else
STATIC_BUILD = 0
!endif
+!if [nmakehlp -f $(OPTS) "nomsvcrt"]
+!message *** Doing nomsvcrt
+MSVCRT = 0
+!else
!if [nmakehlp -f $(OPTS) "msvcrt"]
!message *** Doing msvcrt
MSVCRT = 1
@@ -240,6 +244,7 @@ MSVCRT = 1
MSVCRT = 0
!endif
!endif
+!endif
!if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
!message *** Doing staticpkg
TCL_USE_STATIC_PACKAGES = 1