Turn off SMS by default (pending confirming a way to use the apis in unsigned app); add commented-out NO_DRAW option.

This commit is contained in:
ehouse 2009-01-31 18:02:02 +00:00
parent 7473eef036
commit 0d08147472
2 changed files with 7 additions and 4 deletions

View file

@ -49,7 +49,7 @@ HAVE_COMMCTRL = 1
# CHOOSE_FONTS = -DALLOW_CHOOSE_FONTS # CHOOSE_FONTS = -DALLOW_CHOOSE_FONTS
ifeq ($(TARGET_OS),wince) ifeq ($(TARGET_OS),wince)
SMS = -DXWFEATURE_SMS #SMS = -DXWFEATURE_SMS
RELAY = -DXWFEATURE_RELAY -DCOMMS_HEARTBEAT RELAY = -DXWFEATURE_RELAY -DCOMMS_HEARTBEAT
# IPDIRECT = -DXWFEATURE_IP_DIRECT # IPDIRECT = -DXWFEATURE_IP_DIRECT
# BLUETOOTH = -DXWFEATURE_BLUETOOTH # BLUETOOTH = -DXWFEATURE_BLUETOOTH
@ -81,8 +81,9 @@ else # ifeq ($(TARGET_OS),wince)
ifeq ($(TARGET_OS),win32) ifeq ($(TARGET_OS),win32)
#STANDALONE = -DXWFEATURE_STANDALONE_ONLY #STANDALONE = -DXWFEATURE_STANDALONE_ONLY
STANDALONE = -DPREV_WAS_STANDALONE_ONLY STANDALONE = -DPREV_WAS_STANDALONE_ONLY
# NO_DRAW = -DNO_DRAW
#BLUETOOTH = -DXWFEATURE_BLUETOOTH #BLUETOOTH = -DXWFEATURE_BLUETOOTH
SMS = -DXWFEATURE_SMS #SMS = -DXWFEATURE_SMS
RELAY = -DXWFEATURE_RELAY RELAY = -DXWFEATURE_RELAY
# IPDIRECT = -DXWFEATURE_IP_DIRECT # IPDIRECT = -DXWFEATURE_IP_DIRECT
CC = i586-mingw32msvc-gcc CC = i586-mingw32msvc-gcc
@ -101,7 +102,8 @@ CFLAGS += -DARM -I./ -I../common -I../relay
CFLAGS += -Wall -Wunused-parameter CFLAGS += -Wall -Wunused-parameter
CFLAGS += $(BLUETOOTH) $(RELAY) $(SMS) $(IPDIRECT) $(STANDALONE) $(COLOR_SEL) $(CHOOSE_FONTS) CFLAGS += $(BLUETOOTH) $(RELAY) $(SMS) $(IPDIRECT) $(STANDALONE) $(COLOR_SEL) \
$(CHOOSE_FONTS) $(NO_DRAW)
SVNDEF = -DSVN_REV='\"$(SVNREV)\"' SVNDEF = -DSVN_REV='\"$(SVNREV)\"'
CFLAGS += $(SVNDEF) CFLAGS += $(SVNDEF)

View file

@ -961,6 +961,7 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
XWBonusType bonus, HintAtts hintAtts, XWBonusType bonus, HintAtts hintAtts,
CellFlags flags ) CellFlags flags )
{ {
#ifndef NO_DRAW
CEDrawCtx* dctx = (CEDrawCtx*)p_dctx; CEDrawCtx* dctx = (CEDrawCtx*)p_dctx;
CEAppGlobals* globals = dctx->globals; CEAppGlobals* globals = dctx->globals;
HDC hdc = globals->hdc; HDC hdc = globals->hdc;
@ -1052,7 +1053,7 @@ DRAW_FUNC_NAME(drawCell)( DrawCtx* p_dctx, const XP_Rect* xprect,
ceDrawHintBorders( dctx, xprect, hintAtts ); ceDrawHintBorders( dctx, xprect, hintAtts );
SelectObject( hdc, oldFont ); SelectObject( hdc, oldFont );
#endif
return XP_TRUE; return XP_TRUE;
} /* ce_draw_drawCell */ } /* ce_draw_drawCell */