diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-26 09:50:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-26 09:50:07 (GMT) |
| commit | 716853d7df8e0f73778e0f53ee74564a5c282892 (patch) | |
| tree | 4f43564f3a0b41e20e7ed8b4f510c27550f98d9a /win | |
| parent | 06f3173fc0a3402010291caa151baa8fef3e5a9d (diff) | |
| parent | 05a224b57c876cd9db9d2478dddf9614b16b0661 (diff) | |
| download | tk-716853d7df8e0f73778e0f53ee74564a5c282892.zip tk-716853d7df8e0f73778e0f53ee74564a5c282892.tar.gz tk-716853d7df8e0f73778e0f53ee74564a5c282892.tar.bz2 | |
merge core-8-6-branch
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 2 | ||||
| -rw-r--r-- | win/rules.vc | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 7b1766d..cc90b71 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -169,7 +169,7 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE +CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING # Special compiler flags to use when building man2tcl on Windows. MAN2TCLFLAGS = @MAN2TCLFLAGS@ diff --git a/win/rules.vc b/win/rules.vc index 0d8cd6b..2cd711b 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_ATL_XP_TARGETING
# 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
|