Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-06 20:45:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

Up version for ship; build LocalizedStrIncludes.h per-platform;

Browse source 
include language in all platform obj directory names
This commit is contained in:
ehouse 2007-05-13 21:06:42 +00:00
parent 8a074126db
commit f832959480
5 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/common/config.mk
View file

@ -16,7 +16,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
COMMON_INCS = -I../common -I../relay COMMON_INCS = -I ./$(PLATFORM) -I../common -I../relay
INCLUDES += $(COMMON_INCS) -I./ INCLUDES += $(COMMON_INCS) -I./
COMMONDIR ?= ../common COMMONDIR ?= ../common

20
xwords4/palm/Makefile
View file

@ -72,9 +72,7 @@ endif
endif endif
endif endif
ifneq ($(LANG),en_US)
PLATFORM := $(PLATFORM)_$(shell echo $(LANG) | tr [A-Z] [a-z]) PLATFORM := $(PLATFORM)_$(shell echo $(LANG) | tr [A-Z] [a-z])
endif
APPNAME = "$(NAME)" APPNAME = "$(NAME)"
@ -263,7 +261,7 @@ ship-all:
$(BITMAPS)/%.pbitm: $(BITMAPS)/%.bmp $(BITMAPS)/%.pbitm: $(BITMAPS)/%.bmp
bmtoa $< > $@ bmtoa $< > $@
$(PLATFORM)/objs.prc: LocalizedStrIncludes.h $(OBJS) gdbload $(PLATFORM)/objs.prc: $(PLATFORM)/LocalizedStrIncludes.h $(OBJS) gdbload
@rm -f *.grc *.bin @rm -f *.grc *.bin
ifeq ($(ARCH),ARM_ONLY) ifeq ($(ARCH),ARM_ONLY)
$(CC) $(OBJS) -o tmp.o $(CC) $(OBJS) -o tmp.o
@ -290,20 +288,21 @@ xwords4.rcp: l10n/xwords4_$(LANG).rcp.pre xwords4defines.h $(BITMAP_RSRCS)
# up with offsets out of sync with the .h file. Not sure what to do # up with offsets out of sync with the .h file. Not sure what to do
# about this.... Clean builds are probably a safe fallback. # about this.... Clean builds are probably a safe fallback.
LocalizedStrIncludes.h StrL03e8.bin: \ $(PLATFORM)/LocalizedStrIncludes.h StrL03e8.bin: \
./l10n/StrRes_$(LANG).pre ./l10n/mkstrsres.c ./l10n/StrRes_$(LANG).pre ./l10n/mkstrsres.c
gcc $(CFLAGS) $(FORMATDEFINES) \ gcc $(CFLAGS) $(FORMATDEFINES) \
-DLANGSTRFILE=\"$<\" ./l10n/mkstrsres.c \ -DLANGSTRFILE=\"$<\" ./l10n/mkstrsres.c \
-o mkstrsres -o mkstrsres
./mkstrsres StrL03e8.bin LocalizedStrIncludes.h mkdir -p $(PLATFORM)
./mkstrsres StrL03e8.bin $(PLATFORM)/LocalizedStrIncludes.h
rm -f mkstrsres rm -f mkstrsres
ifneq (x$(BUILD_AS_PNOLET)x, xx) ifneq (x$(BUILD_AS_PNOLET)x, xx)
.PHONY : pnolet .PHONY : pnolet
pnolet: LocalizedStrIncludes.h pnolet: $(PLATFORM)/LocalizedStrIncludes.h
$(MAKE) -f Makefile.PNO MEMDEBUG=$(MEMDEBUG) MYDEFS="$(MYDEFS_ARM) -DAPPID=\'$(APPID)\' \ $(MAKE) -f Makefile.PNO MEMDEBUG=$(MEMDEBUG) PLATFORM=$(PLATFORM) \
-DAPPNAME=\\\"$(APPNAME)\\\"" MYDEFS="$(MYDEFS_ARM) -DAPPID=\'$(APPID)\' -DAPPNAME=\\\"$(APPNAME)\\\""
endif endif
# GDB seems confused by relative paths these days. So generate the # GDB seems confused by relative paths these days. So generate the
@ -317,9 +316,10 @@ gdbload:
clean: clean:
cd ../common && $(MAKE) PLATFORM=$(PLATFORM) $@ cd ../common && $(MAKE) PLATFORM=$(PLATFORM) $@
rm -rf $(PLATFORM)/*.[oa] xwords4 *.bin *.stamp *.[pg]rc \ rm -rf $(PLATFORM)/*.[oa] xwords4 *.bin *.stamp *.[pg]rc \
xwords4.rcp *.btxt $(PLATFORM)/* LocalizedStrIncludes.h gdbload xwords4.rcp *.btxt $(PLATFORM)/* $(PLATFORM)/LocalizedStrIncludes.h \
gdbload
ifneq (x$(BUILD_AS_PNOLET)x, xx) ifneq (x$(BUILD_AS_PNOLET)x, xx)
$(MAKE) -f Makefile.PNO clean $(MAKE) -f Makefile.PNO PLATFORM=$(PLATFORM) clean
endif endif
#cmod03E8.bin: palmdraw.c Makefile #cmod03E8.bin: palmdraw.c Makefile

12
xwords4/palm/Makefile.PNO
View file

@ -1,6 +1,5 @@
# -*- mode: Makefile; compile-command: "make ARCH=ARM_ONLY"; -*- # -*- mode: Makefile; compile-command: "make ARCH=ARM_ONLY"; -*-
PLATFORM = PALM_PNO
PALMDIR = /usr/local/share/palmdev/sdk-5r3/include PALMDIR = /usr/local/share/palmdev/sdk-5r3/include
# Which arm suite to use? Well, the suite in prc-tools-arm is broken # Which arm suite to use? Well, the suite in prc-tools-arm is broken
@ -22,7 +21,7 @@ ifeq ($(MEMDEBUG),TRUE)
DEBUG = -DMEM_DEBUG -DDEBUG DEBUG = -DMEM_DEBUG -DDEBUG
endif endif
INCLUDE += \ INCLUDES += \
-I$(PALMDIR) \ -I$(PALMDIR) \
-I$(PALMDIR)/Libraries \ -I$(PALMDIR)/Libraries \
-I$(PALMDIR)/Dynamic \ -I$(PALMDIR)/Dynamic \
@ -35,8 +34,8 @@ INCLUDE += \
-I$(PALMDIR)/Extensions/Bluetooth \ -I$(PALMDIR)/Extensions/Bluetooth \
ifneq (, $(findstring XWFEATURE_FIVEWAY,$(MYDEFS))) ifneq (, $(findstring XWFEATURE_FIVEWAY,$(MYDEFS)))
INCLUDE += -I/usr/local/share/palmdev/Handspring5 INCLUDES += -I/usr/local/share/palmdev/Handspring5
INCLUDE += -I/usr/local/share/palmdev/Handspring5/68K INCLUDES += -I/usr/local/share/palmdev/Handspring5/68K
GENDEFS += -DXWFEATURE_FIVEWAY GENDEFS += -DXWFEATURE_FIVEWAY
endif endif
@ -44,9 +43,6 @@ ifneq (, $(findstring XWFEATURE_BLUETOOTH,$(MYDEFS)))
GENDEFS += -DXWFEATURE_BLUETOOTH GENDEFS += -DXWFEATURE_BLUETOOTH
endif endif
INCLUDE += \
-I. -I../common -I../relay
# NOTE!!!! Added the -w flag to supress all warnings since arm-elf-gcc # NOTE!!!! Added the -w flag to supress all warnings since arm-elf-gcc
# does so much bitching about the Palm headers. Need to fix that, or # does so much bitching about the Palm headers. Need to fix that, or
# use the arm-palmos-gcc, or something. But for now, -w.... # use the arm-palmos-gcc, or something. But for now, -w....
@ -55,7 +51,7 @@ ARMCCFS = $(CCFLAGS) -DNATIVE $(DEBUG) \
-nostartfiles -mshort-load-bytes -nodefaultlibs -ffixed-r9 \ -nostartfiles -mshort-load-bytes -nodefaultlibs -ffixed-r9 \
-mpic-register=r10 -msingle-pic-base -fpic \ -mpic-register=r10 -msingle-pic-base -fpic \
-Wno-multichar \ -Wno-multichar \
$(INCLUDE) $(INCLUDES)
ARMLDFS = -Xlinker --script=./ldscript.arm -lgcc ARMLDFS = -Xlinker --script=./ldscript.arm -lgcc

3
xwords4/palm/palmmain.c
View file

@ -979,9 +979,10 @@ initHighResGlobals( PalmAppGlobals* globals )
&& ((vers & sysFtrNumUIHardwareHas5Way) != 0) && !globals->isZodiac; && ((vers & sysFtrNumUIHardwareHas5Way) != 0) && !globals->isZodiac;
err = FtrGet( hsFtrCreator, hsFtrIDNavigationSupported, &vers ); err = FtrGet( hsFtrCreator, hsFtrIDNavigationSupported, &vers );
XP_ASSERT( errNone == err ); if ( errNone == err ) {
XP_ASSERT( vers == 1 || vers == 2 ); XP_ASSERT( vers == 1 || vers == 2 );
globals->isTreo600 = (err == errNone) && (vers == 1); globals->isTreo600 = (err == errNone) && (vers == 1);
}
#endif #endif
#ifdef FEATURE_SILK #ifdef FEATURE_SILK

2
xwords4/palm/xwords4defines.h
View file

@ -436,7 +436,7 @@
#ifdef XWFEATURE_BLUETOOTH #ifdef XWFEATURE_BLUETOOTH
# define XW_PALM_VERSION_STRING "4.3a9" # define XW_PALM_VERSION_STRING "4.3a9"
#else #else
# define XW_PALM_VERSION_STRING "4.2rc2" # define XW_PALM_VERSION_STRING "4.2"
#endif #endif
#define CUR_PREFS_VERS 0x0405 #define CUR_PREFS_VERS 0x0405