summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-21 09:28:39 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-21 09:28:39 (GMT)
commite6cf6979cb99a3488a2895f723fb97914397b132 (patch)
tree6b4c3d835846d4c615f17c627e2bd3fc15b4dec3 /win
parenta69fadd5c0c50f03fb746432bd3234f9a4af1c63 (diff)
parent3b786ffebeb7769d34099ea7064532501dc6aee5 (diff)
downloadtcl-e6cf6979cb99a3488a2895f723fb97914397b132.zip
tcl-e6cf6979cb99a3488a2895f723fb97914397b132.tar.gz
tcl-e6cf6979cb99a3488a2895f723fb97914397b132.tar.bz2
Merge core-8-6-branch. Add more comments to tclLiteral.c, contributed by mr_calvin
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in2
-rw-r--r--win/rules.vc2
2 files changed, 2 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 28ffe0a..066e6b1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -81,7 +81,7 @@ CFLAGS_OPTIMIZE = @CFLAGS_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
# To compile without backward compatibility and deprecated code uncomment the
# following
diff --git a/win/rules.vc b/win/rules.vc
index d4c2f35..30e8c2f 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]