add missing define; copy .sis to web dir; define dir based on series

so code can find files
This commit is contained in:
ehouse 2005-02-12 02:58:37 +00:00
parent 8ea5a551d5
commit ccf6193c67

View file

@ -14,6 +14,7 @@ include $(EPOC)/lib/makerules/eikon
COMMONDIR = ../../common COMMONDIR = ../../common
PLATFORM = SYMB_$(SERIES) PLATFORM = SYMB_$(SERIES)
XWORDS_DIR = \"xwords_$(SERIES)\"
include ../../common/config.mk include ../../common/config.mk
@ -92,10 +93,10 @@ OBJDIR = $(SRCDIR)/$(PLATFORM)
OBJECTS = $(patsubst $(SRCDIR)/%,$(OBJDIR)/%,$(LCLSRC:.cpp=.o)) $(COMMONOBJ) OBJECTS = $(patsubst $(SRCDIR)/%,$(OBJDIR)/%,$(LCLSRC:.cpp=.o)) $(COMMONOBJ)
THEAPP=$(NAME).app THEAPP = $(NAME).app
MAJOR=2 MAJOR = 4
MINOR=4 MINOR = 1
PKGVERS=$(MAJOR),$(MINOR) PKGVERS = $(MAJOR),$(MINOR)
MBG = $(NAME).mbg MBG = $(NAME).mbg
@ -106,11 +107,12 @@ U2 = 100039ce
U3 = 10206D64 U3 = 10206D64
DEBUG_FLAGS = -DDEBUG -DMEM_DEBUG DEBUG_FLAGS = -DDEBUG -DMEM_DEBUG
CFLAGS = -O -I. -DUID3=0x$(U3) $(DEBUG_FLAGS) \ CFLAGS += -O -I. -DUID3=0x$(U3) $(DEBUG_FLAGS) \
-DXWORDS_DIR=$(XWORDS_DIR) \
-D__LITTLE_ENDIAN -DKEYBOARD_NAV \ -D__LITTLE_ENDIAN -DKEYBOARD_NAV \
-DKEY_SUPPORT -DFEATURE_TRAY_EDIT -DNODE_CAN_4 \ -DKEY_SUPPORT -DFEATURE_TRAY_EDIT -DNODE_CAN_4 \
-DXWFEATURE_STANDALONE_ONLY -D$(SYMARCH) \ -DXWFEATURE_STANDALONE_ONLY -D$(SYMARCH) \
-DSYM_ARMI \ -DSYM_ARMI -DOS_INITS_DRAW \
$(INCDIR) $(INCDIR)
# This violates the no-data rule. Don't allow it for ARMI build. # This violates the no-data rule. Don't allow it for ARMI build.
@ -125,6 +127,9 @@ CPPFLAGS += -D_EPOC32_6 -DCPLUS -I../inc -D$(SYMARCH)
all: _sanity $(PKGFILES) $(NAME).sis all: _sanity $(PKGFILES) $(NAME).sis
mv $(NAME).sis $(NAME)-$(MAJOR).$(MINOR)-$(ARCH).sis mv $(NAME).sis $(NAME)-$(MAJOR).$(MINOR)-$(ARCH).sis
ifdef XW_UPLOAD_DIR
cp $(NAME)-$(MAJOR).$(MINOR)-$(ARCH).sis $$XW_UPLOAD_DIR
endif
_sanity: _sanity:
@if [ "$(EPOC_$(SERIES))" = "" ]; then \ @if [ "$(EPOC_$(SERIES))" = "" ]; then \