Mercurial > dwindows
changeset 1618:428148fd0976
Switch to UNICODE builds by default on Windows.
Need to include tchar.h not wchar.h and missed a required TEXT() place.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Tue, 27 Mar 2012 14:46:04 +0000 |
| parents | f8d1da63fb77 |
| children | 4034562aee7f |
| files | makefile.vc win/dw.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/makefile.vc Tue Mar 27 08:51:14 2012 +0000 +++ b/makefile.vc Tue Mar 27 14:46:04 2012 +0000 @@ -60,7 +60,7 @@ !endif CC = cl -CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DGDIPLUS -DAEROGLASS -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(SVNVERSION) +CFLAGS = -c $(PLATFORM_DEF) -D__WIN32__ -DMSVC -DGDIPLUS -DAEROGLASS -D_UNICODE -DUNICODE -DBUILD_DLL -DISOLATION_AWARE_ENABLED=1 -I$(SRCDIR)\platform -I$(SRCDIR) $(SVNVERSION) LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib userenv.lib msimg32.lib gdiplus.lib RES = LINKFLAGS = -machine:$(TARGET_CPU) -manifest $(LINK_DEBUG)
--- a/win/dw.c Tue Mar 27 08:51:14 2012 +0000 +++ b/win/dw.c Tue Mar 27 14:46:04 2012 +0000 @@ -14,7 +14,7 @@ #include <shlwapi.h> #include <shlobj.h> #include <userenv.h> -#include <wchar.h> +#include <tchar.h> #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -6938,7 +6938,7 @@ tmpitem[index].type = TYPEBOX; else { - if(_tcsnicmp(tmpbuf, "SysMonthCal32", 13)==0) + if(_tcsnicmp(tmpbuf, TEXT("SysMonthCal32"), 13)==0) { RECT rc; MonthCal_GetMinReqRect(item, &rc);