diff --git a/palm/Makefile b/palm/Makefile index a9a201121..fc23983dd 100644 --- a/palm/Makefile +++ b/palm/Makefile @@ -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 diff --git a/palm/l10n/StrRes_en_US.pre b/palm/l10n/StrRes_en_US.pre index dc8a68e99..d0811d4be 100644 --- a/palm/l10n/StrRes_en_US.pre +++ b/palm/l10n/StrRes_en_US.pre @@ -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. "\ diff --git a/palm/xwords4defines.h b/palm/xwords4defines.h index 4cec8a1d5..ec64979e1 100644 --- a/palm/xwords4defines.h +++ b/palm/xwords4defines.h @@ -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