diff options
| author | nijtmans <nijtmans> | 2010-09-14 08:50:20 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-09-14 08:50:20 (GMT) |
| commit | 489243375bc1695860d1034b6f519b93c589835c (patch) | |
| tree | 0884517687e8c7116bfaa6cc4634e1496a55a730 | |
| parent | 0c254e968229c9bc7eff66532569fa0f9ff3be5f (diff) | |
| download | tk-489243375bc1695860d1034b6f519b93c589835c.zip tk-489243375bc1695860d1034b6f519b93c589835c.tar.gz tk-489243375bc1695860d1034b6f519b93c589835c.tar.bz2 | |
[FRQ 2965056]: Windows build with -DUNICODE
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/Makefile.in | 4 | ||||
| -rw-r--r-- | win/rules.vc | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2013-09-14 Jan Nijtmans <nijtmans@users.sf.net> + + * win/rules.vc [FRQ 2965056]: Windows build with -DUNICODE + * win/Makefile.in + 2013-09-13 Jan Nijtmans <nijtmans@users.sf.net> * win/tkWin.h Move definitions of WINVER/_WIN32_WINNT diff --git a/win/Makefile.in b/win/Makefile.in index d77fe8d..065c21a 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -4,7 +4,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.92 2010/08/27 00:57:50 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.93 2010/09/14 08:50:20 nijtmans Exp $ TCLVERSION = @TCL_VERSION@ TCLPATCHL = @TCL_PATCH_LEVEL@ @@ -166,7 +166,7 @@ LDFLAGS_OPTIMIZE = @LDFLAGS_OPTIMIZE@ #CFLAGS = $(CFLAGS_DEBUG) #CFLAGS = $(CFLAGS_OPTIMIZE) #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) -CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ +CFLAGS = @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE # Special compiler flags to use when building man2tcl on Windows. MAN2TCLFLAGS = @MAN2TCLFLAGS@ diff --git a/win/rules.vc b/win/rules.vc index fab8118..f9aefe9 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -11,7 +11,7 @@ # Copyright (c) 2003-2007 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.27 2010/09/09 14:59:24 nijtmans Exp $ +# RCS: @(#) $Id: rules.vc,v 1.28 2010/09/14 08:50:20 nijtmans Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -130,7 +130,7 @@ DEBUGFLAGS = $(DEBUGFLAGS) -RTC1 DEBUGFLAGS = $(DEBUGFLAGS) -GZ !endif -COMPILERFLAGS =-W3 +COMPILERFLAGS =-W3 -DUNICODE -D_UNICODE # In v13 -GL and -YX are incompatible. !if [nmakehlp -c -YX] |