mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2024-12-26 09:58:20 +01:00
tweaks to compile both standalone and for relay use. Remember: Symbian
code hasn't been run in over a year.
This commit is contained in:
parent
12fec52152
commit
63aae5c4b6
3 changed files with 7 additions and 4 deletions
|
@ -20,6 +20,7 @@ XWORDS_DIR = \"xwords_$(SERIES)\"
|
|||
include ../../common/config.mk
|
||||
|
||||
#STANDALONE_ONLY ?= -DXWFEATURE_STANDALONE_ONLY
|
||||
BEYOND_IR = -DBEYOND_IR
|
||||
|
||||
LIBS_ALLSERIES = \
|
||||
$(EPOCTRGREL)/euser.lib \
|
||||
|
@ -125,7 +126,7 @@ CFLAGS += $(OPT) -I. -DUID3=0x$(U3) $(DEBUG_FLAGS) \
|
|||
-D__LITTLE_ENDIAN -DKEYBOARD_NAV \
|
||||
-DKEY_SUPPORT -DFEATURE_TRAY_EDIT -DNODE_CAN_4 \
|
||||
$(STANDALONE_ONLY) -D$(SYMARCH) \
|
||||
-DSYM_ARMI -DOS_INITS_DRAW -DBEYOND_IR \
|
||||
-DSYM_ARMI -DOS_INITS_DRAW $(BEYOND_IR) \
|
||||
$(INCDIR)
|
||||
|
||||
# This violates the no-data rule. Don't allow it for ARMI build.
|
||||
|
|
|
@ -156,15 +156,15 @@ class CXWordsAppView : public CCoeControl
|
|||
static XWStreamCtxt* sym_util_makeStreamFromAddr( XW_UtilCtxt* uc,
|
||||
XP_U16 channelNo );
|
||||
|
||||
static void sym_util_setTimer( XW_UtilCtxt* uc,
|
||||
XWTimerReason why, XP_U16 when,
|
||||
TimerProc proc, void* closure );
|
||||
#ifdef BEYOND_IR
|
||||
static void sym_util_listenPortChange( XW_UtilCtxt* uc,
|
||||
XP_U16 listenPort );
|
||||
static void sym_util_addrChange( XW_UtilCtxt* uc,
|
||||
const CommsAddrRec* aOld,
|
||||
const CommsAddrRec* aNew );
|
||||
static void sym_util_setTimer( XW_UtilCtxt* uc,
|
||||
XWTimerReason why, XP_U16 when,
|
||||
TimerProc proc, void* closure );
|
||||
#endif
|
||||
|
||||
#ifdef XWFEATURE_STANDALONE_ONLY
|
||||
|
|
|
@ -398,6 +398,7 @@ sym_util_engineProgressCallback( XW_UtilCtxt* /*uc*/ )
|
|||
/*static*/ TInt
|
||||
CXWordsAppView::HeartbeatTimerCallback( TAny* closure )
|
||||
{
|
||||
#ifdef BEYOND_IR
|
||||
CXWordsAppView* self = (CXWordsAppView*)closure;
|
||||
self->iHBQueued = XP_FALSE;
|
||||
|
||||
|
@ -405,6 +406,7 @@ CXWordsAppView::HeartbeatTimerCallback( TAny* closure )
|
|||
void* hbclosure;
|
||||
self->GetHeartbeatCB( &proc, &hbclosure );
|
||||
(*proc)( hbclosure, TIMER_HEARTBEAT );
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue