# HG changeset patch # User bsmith@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1332859564 0 # Node ID 428148fd09760fb7df9f460dd4961dfcc292e239 # Parent f8d1da63fb77b727b3eaf51e6ec2add59b91ffa7 Switch to UNICODE builds by default on Windows. Need to include tchar.h not wchar.h and missed a required TEXT() place. diff -r f8d1da63fb77 -r 428148fd0976 makefile.vc --- 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) diff -r f8d1da63fb77 -r 428148fd0976 win/dw.c --- 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 #include #include -#include +#include #include #include #include @@ -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);