BT work is now 4.3. Nav work moves into beta as 4.2.

This commit is contained in:
ehouse 2006-12-13 05:03:19 +00:00
parent e25caaba1a
commit e5f256867c
3 changed files with 9 additions and 10 deletions

View file

@ -118,7 +118,7 @@ MYDEFS_COMMON += -DXWFEATURE_SEARCHLIMIT
# MYDEFS_COMMON += -DXWFEATURE_RELAY
# turn on bluetooth comms option for 68K and ARM -- which won't work yet
BLUETOOTH = -DXWFEATURE_BLUETOOTH
#BLUETOOTH = -DXWFEATURE_BLUETOOTH
#MYDEFS_COMMON += $(BLUETOOTH)
# Add menu allowing to choose to run 68K or ARM
@ -162,7 +162,9 @@ BITMAP_RSRCS = \
$(BITMAPS)/xwords4.pbitm \
# INCLUDES += -I/usr/local/share/palmdev/sdk-5r3/Extensions/ExpansionMgr
ifdef BLUETOOTH
INCLUDES += -I/usr/local/share/palmdev/sdk-5r3/include/Extensions/Bluetooth
endif
XWFEATURE_FIVEWAY = -DXWFEATURE_FIVEWAY -DKEYBOARD_NAV
@ -177,7 +179,6 @@ ifneq (x$(XWFEATURE_FIVEWAY)x, xx)
MYDEFS_68K += $(XWFEATURE_FIVEWAY)
MYDEFS_ARM += $(XWFEATURE_FIVEWAY)
FNAVS = ./fnav03e9.bin
endif
INCLUDES += -I/usr/local/share/palmdev/sdk-5r3/include/SonyIncs
@ -297,11 +298,6 @@ LocalizedStrIncludes.h StrL03e8.bin: \
rm -f mkstrsres
namehash: namehash.c ownerhash.h
fnavgen: fnavgen.c
gcc $< -o $@
$(FNAVS): ./fnavgen
./$<
ifneq (x$(BUILD_AS_PNOLET)x, xx)
.PHONY : pnolet

View file

@ -138,12 +138,11 @@
#endif
{ "STR_ABOUT_CONTENT",
#if 1
#ifdef XWFEATURE_BLUETOOTH
"THANKS FOR LOOKING at this alpha version of "
"Crosswords. Please see the notes and caveats at "
"xwords.sf.net/bt_palm.php. Please report bugs to "
"ehouse@users.sf.net. Enjoy!\n\n"
#endif
"Crosswords " XW_PALM_VERSION_STRING " (rev. " SVN_REV ").\n" \
"Copyright 1998-2006 by Eric House. "\

View file

@ -422,7 +422,11 @@
#define kFrmNavHeaderFlagsAppFocusStartState 0x00000002
/* versioning stuff */
#define XW_PALM_VERSION_STRING "4.2a3"
#ifdef XWFEATURE_BLUETOOTH
# define XW_PALM_VERSION_STRING "4.3a4"
#else
# define XW_PALM_VERSION_STRING "4.2b1"
#endif
#define CUR_PREFS_VERS 0x0405