Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-29 10:26:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wrap launch-68K option in compile-time flag off by default

Browse source
This commit is contained in:
ehouse 2004-11-08 14:44:52 +00:00
parent febc56c9c5
commit 5122a003b6
5 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
palm/Makefile
View file

@ -93,6 +93,9 @@ MYDEFS_68K = -DPLATFORM_PALM -D__BIG_ENDIAN $(MYDEFS_COMMON) -DAPPNAME=\"$(APPNA
ifneq (x$(BUILD_AS_PNOLET)x, xx)
# comment out for ARM-only build
FEATURE_PNOAND68K = -DFEATURE_PNOAND68K
# Turn this on for a menu that lets you relaunch as 68K or ARM. Good
# for testing but not the way to ship to users
# FEATURE_PNOAND68K += -DFEATURE_DUALCHOOSE
endif

2
palm/enter68k.c
View file

@ -180,12 +180,14 @@ shouldRunPnolet()
if ( ( err == errNone ) && sysFtrNumProcessorIsARM( value ) ) {
runArm = true;
}
#ifdef FEATURE_DUALCHOOSE
if ( runArm ) {
err = FtrGet( APPID, FEATURE_WANTS_68K, &value );
if ( (err == errNone) && (value == WANTS_68K) ) {
runArm = false;
}
}
#endif
return runArm;
} /* shouldRunPnolet */

4
palm/palmdict.c
View file

@ -395,15 +395,19 @@ palm_dictionary_destroy( DictionaryCtxt* dict )
XP_FREE( dict->mpool, ctxt->super.faces16 );
#ifdef XWFEATURE_COMBINEDAWG
/* Try first to delete the feature. */
if ( FtrPtrFree( APPID, DAWG_STORE_FEATURE ) == ftrErrNoSuchFeature ) {
#endif
for ( i = 0; i < ctxt->nRecords; ++i ) {
XP_ASSERT( !!ctxt->dictStarts[i].array );
MemPtrUnlock( ctxt->dictStarts[i].array );
}
#ifdef XWFEATURE_COMBINEDAWG
} else {
XP_ASSERT( ctxt->dictStarts[0].array == NULL );
}
#endif
MemPtrUnlock( headerRecP );

2
palm/palmmain.c
View file

@ -2313,7 +2313,7 @@ mainViewHandleEvent( EventPtr event )
beamBoard( globals );
break;
#ifdef FEATURE_PNOAND68K
#ifdef FEATURE_DUALCHOOSE
/* This probably goes away at ship.... */
case XW_RUN68K_PULLDOWN_ID:
case XW_RUNARM_PULLDOWN_ID: {

4
palm/palmmain.h
View file

@ -331,9 +331,13 @@ enum { dictSelectedEvent = firstUserEvent /* 0x6000 */
enum {
PNOLET_STORE_FEATURE = 1 /* where FtrPtr to pnolet code lives */
, GLOBALS_FEATURE /* for passing globals to form handlers */
#ifdef FEATURE_DUALCHOOSE
, FEATURE_WANTS_68K /* support for (pre-ship) ability to choose
armlet or 68K */
#endif
#ifdef XWFEATURE_COMBINEDAWG
, DAWG_STORE_FEATURE
#endif
};
enum { WANTS_68K, WANTS_ARM };