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

don't use palm's all-uppercase tradition for PNOlet resource.

Browse source
This commit is contained in:
ehouse 2004-10-07 13:27:58 +00:00
parent 58f5f7b38c
commit e243454fd4
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
palm/Makefile.PNO
View file

@ -62,7 +62,7 @@ OBJS = $(PLATFORM)/pnolet.o \
# get made as a matter of course and as long as they all get included # get made as a matter of course and as long as they all get included
# in the .prc we're fine. # in the .prc we're fine.
all: PNOC0000.bin PNOG0000.bin all: Pnoc0000.bin Pnog0000.bin
$(PLATFORM)/%.o : %.c $(MAKEFILE) $(PLATFORM)/%.o : %.c $(MAKEFILE)
mkdir -p $(PLATFORM) mkdir -p $(PLATFORM)
@ -72,19 +72,19 @@ $(COMMONOBJDIR)/%.o : $(COMMONDIR)/%.c $(MAKEFILE)
mkdir -p $(COMMONOBJDIR) mkdir -p $(COMMONOBJDIR)
$(CC_ARM) -o $@ -c $(ARM_DEFINES) -DHERE $(ARMCCFS) $< $(CC_ARM) -o $@ -c $(ARM_DEFINES) -DHERE $(ARMCCFS) $<
PNOC_bin.pre PNOG0000.bin: pace_gen.h $(OBJS) Pnoc_bin.pre Pnog0000.bin: pace_gen.h $(OBJS)
$(CC_ARM) $(OBJS) $(ARMCCFS) $(ARMLDFS) -Wl,-Map,PNOC_bin.map -o tmp.out $(CC_ARM) $(OBJS) $(ARMCCFS) $(ARMLDFS) -Wl,-Map,Pnoc_bin.map -o tmp.out
# @$(OD_ARM) --disassemble-all tmp.out # @$(OD_ARM) --disassemble-all tmp.out
$(OC_ARM) -j .text -O binary tmp.out PNOC_bin.pre $(OC_ARM) -j .text -O binary tmp.out Pnoc_bin.pre
$(OC_ARM) -j .got -O binary tmp.out PNOG0000.bin $(OC_ARM) -j .got -O binary tmp.out Pnog0000.bin
# @rm -f tmp.out # @rm -f tmp.out
# create not only PNOC0000.bin but any others required to fit the # create not only Pnoc0000.bin but any others required to fit the
# pnolet into 50K chunks (for hotsyncing...) # pnolet into 50K chunks (for hotsyncing...)
PNOC0000.bin: PNOC_bin.pre Pnoc0000.bin: Pnoc_bin.pre
rm -f PNOC????.bin rm -f Pnoc????.bin
split -a 4 -b 50k -d $< PNOC split -a 4 -b 50k -d $< Pnoc
for f in $$(ls PNOC????); do mv $$f $$f.bin; done for f in $$(ls Pnoc????); do mv $$f $$f.bin; done
pace_gen.c pace_gen.h: ./gen_pace.pl funcfile.txt pace_gen.c pace_gen.h: ./gen_pace.pl funcfile.txt
rm -f $@ _dirList rm -f $@ _dirList
@ -96,4 +96,4 @@ pace_gen.c pace_gen.h: ./gen_pace.pl funcfile.txt
rm -f _dirList rm -f _dirList
clean: clean:
rm -rf $(OBJS) pace_gen.c pace_gen.h *.bin PNOC_bin.pre rm -rf $(OBJS) pace_gen.c pace_gen.h *.bin Pnoc_bin.pre

7
palm/enter68k.c
View file

@ -82,7 +82,7 @@ countOrLoadPNOCs( UInt32* pnoSizeP, UInt8* base, UInt32 offset )
for ( id = 0; ; ++id ) { for ( id = 0; ; ++id ) {
UInt32 size; UInt32 size;
MemHandle h = DmGetResource( 'PNOC', id ); MemHandle h = DmGetResource( 'Pnoc', id );
if ( !h ) { if ( !h ) {
break; break;
@ -123,7 +123,7 @@ setupPnolet( UInt32** entryP, UInt32** gotTableP )
PNOFtrHeader header; PNOFtrHeader header;
// LOAD: GOT table // LOAD: GOT table
MemHandle h = DmGetResource( 'PNOG', 0 ); MemHandle h = DmGetResource( 'Pnog', 0 );
if ( !h ) { if ( !h ) {
gotSize = 0; gotSize = 0;
gotTable = NULL; gotTable = NULL;
@ -233,7 +233,8 @@ PilotMain( UInt16 cmd, MemPtr cmdPBP, UInt16 launchFlags)
#ifdef FEATURE_PNOAND68K #ifdef FEATURE_PNOAND68K
result = PM2(PilotMain)( cmd, cmdPBP, launchFlags); result = PM2(PilotMain)( cmd, cmdPBP, launchFlags);
#else #else
alertUser( "Arm-only Crosswords won't run on this device" ); alertUser( "This copy of Crosswords runs only on ARM-based Palms. "
"Get the right version at xwords.sf.net." );
#endif #endif
} }
} }