summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-26 09:03:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-26 09:03:41 (GMT)
commit4845558655c4e820d7f4518ca690338e4b395401 (patch)
tree43b8b65e985f371a70dec94f6cffaafc82c03c51
parent13b0ea92ae0d9159c5e7c9c3f3715f945e077782 (diff)
parent67d090642b7f122f5ea528152b39ec3e4e2a0505 (diff)
downloadtk-4845558655c4e820d7f4518ca690338e4b395401.zip
tk-4845558655c4e820d7f4518ca690338e4b395401.tar.gz
tk-4845558655c4e820d7f4518ca690338e4b395401.tar.bz2
Permit static linking to the MSVCRT as a stand-alone option. Patch by Joe Mistachkin.
-rw-r--r--win/rules.vc5
1 files changed, 5 insertions, 0 deletions
diff --git a/win/rules.vc b/win/rules.vc
index 6fd079a..2cd711b 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