Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweaks to compile both standalone and for relay use. Remember: Symbian

Browse source 
code hasn't been run in over a year.
This commit is contained in:
ehouse 2006-09-23 20:40:36 +00:00
parent 12fec52152
commit 63aae5c4b6
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
symbian/group/bldlinux.mk
View file

@ -20,6 +20,7 @@ XWORDS_DIR = \"xwords_$(SERIES)\"
include ../../common/config.mk include ../../common/config.mk
#STANDALONE_ONLY ?= -DXWFEATURE_STANDALONE_ONLY #STANDALONE_ONLY ?= -DXWFEATURE_STANDALONE_ONLY
BEYOND_IR = -DBEYOND_IR
LIBS_ALLSERIES = \ LIBS_ALLSERIES = \
$(EPOCTRGREL)/euser.lib \ $(EPOCTRGREL)/euser.lib \
@ -125,7 +126,7 @@ CFLAGS += $(OPT) -I. -DUID3=0x$(U3) $(DEBUG_FLAGS) \
-D__LITTLE_ENDIAN -DKEYBOARD_NAV \ -D__LITTLE_ENDIAN -DKEYBOARD_NAV \
-DKEY_SUPPORT -DFEATURE_TRAY_EDIT -DNODE_CAN_4 \ -DKEY_SUPPORT -DFEATURE_TRAY_EDIT -DNODE_CAN_4 \
$(STANDALONE_ONLY) -D$(SYMARCH) \ $(STANDALONE_ONLY) -D$(SYMARCH) \
-DSYM_ARMI -DOS_INITS_DRAW -DBEYOND_IR \ -DSYM_ARMI -DOS_INITS_DRAW $(BEYOND_IR) \
$(INCDIR) $(INCDIR)
# This violates the no-data rule. Don't allow it for ARMI build. # This violates the no-data rule. Don't allow it for ARMI build.

6
symbian/inc/xwappview.h
View file

@ -156,15 +156,15 @@ class CXWordsAppView : public CCoeControl
static XWStreamCtxt* sym_util_makeStreamFromAddr( XW_UtilCtxt* uc, static XWStreamCtxt* sym_util_makeStreamFromAddr( XW_UtilCtxt* uc,
XP_U16 channelNo ); XP_U16 channelNo );
static void sym_util_setTimer( XW_UtilCtxt* uc,
XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure );
#ifdef BEYOND_IR #ifdef BEYOND_IR
static void sym_util_listenPortChange( XW_UtilCtxt* uc, static void sym_util_listenPortChange( XW_UtilCtxt* uc,
XP_U16 listenPort ); XP_U16 listenPort );
static void sym_util_addrChange( XW_UtilCtxt* uc, static void sym_util_addrChange( XW_UtilCtxt* uc,
const CommsAddrRec* aOld, const CommsAddrRec* aOld,
const CommsAddrRec* aNew ); const CommsAddrRec* aNew );
static void sym_util_setTimer( XW_UtilCtxt* uc,
XWTimerReason why, XP_U16 when,
TimerProc proc, void* closure );
#endif #endif
#ifdef XWFEATURE_STANDALONE_ONLY #ifdef XWFEATURE_STANDALONE_ONLY

2
symbian/src/xwappview.cpp
View file

@ -398,6 +398,7 @@ sym_util_engineProgressCallback( XW_UtilCtxt* /*uc*/ )
/*static*/ TInt /*static*/ TInt
CXWordsAppView::HeartbeatTimerCallback( TAny* closure ) CXWordsAppView::HeartbeatTimerCallback( TAny* closure )
{ {
#ifdef BEYOND_IR
CXWordsAppView* self = (CXWordsAppView*)closure; CXWordsAppView* self = (CXWordsAppView*)closure;
self->iHBQueued = XP_FALSE; self->iHBQueued = XP_FALSE;
@ -405,6 +406,7 @@ CXWordsAppView::HeartbeatTimerCallback( TAny* closure )
void* hbclosure; void* hbclosure;
self->GetHeartbeatCB( &proc, &hbclosure ); self->GetHeartbeatCB( &proc, &hbclosure );
(*proc)( hbclosure, TIMER_HEARTBEAT ); (*proc)( hbclosure, TIMER_HEARTBEAT );
#endif
return 0; return 0;
} }