diff options
| author | Joe Mistachkin <joe@mistachkin.com> | 2016-09-19 18:52:19 (GMT) |
|---|---|---|
| committer | Joe Mistachkin <joe@mistachkin.com> | 2016-09-19 18:52:19 (GMT) |
| commit | 5a01c1718d0e4d22ca532721611e0546c5512e33 (patch) | |
| tree | 880b849915c653719640afc6f67da40a683738e2 | |
| parent | e6c511bc0f3e28d8f52ec3fce2f38b1ed154fa71 (diff) | |
| download | tk-5a01c1718d0e4d22ca532721611e0546c5512e33.zip tk-5a01c1718d0e4d22ca532721611e0546c5512e33.tar.gz tk-5a01c1718d0e4d22ca532721611e0546c5512e33.tar.bz2 | |
Permit static linking to the MSVCRT as a stand-alone option. Enable WinXP SDK compatibility.winFixes
| -rw-r--r-- | win/rules.vc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/win/rules.vc b/win/rules.vc index 0d8cd6b..503df50 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -159,7 +159,7 @@ DEBUGFLAGS = $(DEBUGFLAGS) -RTC1 DEBUGFLAGS = $(DEBUGFLAGS) -GZ
!endif
-COMPILERFLAGS =-W3 -DUNICODE -D_UNICODE
+COMPILERFLAGS =-W3 -DUNICODE -D_UNICODE -D_USING_V110_SDK71_=1
# In v13 -GL and -YX are incompatible.
!if [nmakehlp -c -YX]
@@ -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
|