mirror of
git://xwords.git.sourceforge.net/gitroot/xwords/xwords
synced 2025-01-03 23:04:08 +01:00
cleanup
This commit is contained in:
parent
e99c338726
commit
53a91b579a
1 changed files with 17 additions and 26 deletions
|
@ -3,8 +3,8 @@
|
|||
SERIES ?= 80
|
||||
TARGET ?= WINS
|
||||
|
||||
U1 = 1000007a
|
||||
#U1 = 10000079???
|
||||
#U1 = 1000007a
|
||||
U1 = 10000079
|
||||
U2 = 100039ce
|
||||
U3 = 10206D64
|
||||
|
||||
|
@ -12,7 +12,7 @@ U3 = 10206D64
|
|||
EPOC = $(EPOC_$(SERIES))
|
||||
NAME = xwords_$(SERIES)
|
||||
DESTDIR = $(EPOC)/release/wins/udeb/z/system/apps/$(NAME)
|
||||
|
||||
DICT = ../../dawg/English/BasEnglish2to8.xwd
|
||||
EDLL_LIB = $(EPOC)/release/wins/udeb/edll.lib
|
||||
|
||||
#CPP = $(EPOC)/gcc/bin/gcc -E
|
||||
|
@ -73,7 +73,7 @@ COMMONDIR = ../../common
|
|||
PLATFORM = SYMB_$(SERIES)_$(TARGET)
|
||||
XWORDS_DIR = \"xwords_$(SERIES)\"
|
||||
|
||||
include ../../common/config.mk
|
||||
include $(COMMONDIR)/config.mk
|
||||
|
||||
EPOCTRGREL = $(EPOC)/release/wins/udeb
|
||||
|
||||
|
@ -109,18 +109,18 @@ LIBS_80 = \
|
|||
|
||||
LIBS = $(LIBS_ALLSERIES) $(LIBS_$(SERIES))
|
||||
|
||||
STAGE1_LINK_FLAGS = \
|
||||
STAGE_BOTH_LINK_FLAGS = \
|
||||
$(EDLL_LIB) $(LIBS) /nologo \
|
||||
/entry:"_E32Dll" /subsystem:windows /dll /incremental:no /machine:IX86 \
|
||||
/nodefaultlib /include:"?_E32Dll@@YGHPAXI0@Z" \
|
||||
/include:"?_E32Dll@@YGHPAXI0@Z" /nodefaultlib \
|
||||
/entry:"_E32Dll" /subsystem:windows /dll \
|
||||
/out:$(NAME).app \
|
||||
/machine:IX86 \
|
||||
|
||||
STAGE2_LINK_FLAGS = \
|
||||
$(EDLL_LIB) \
|
||||
$(LIBS) /nologo /entry:"_E32Dll" \
|
||||
/subsystem:windows /dll $(NAME).exp /debug \
|
||||
/machine:IX86 /nodefaultlib /include:"?_E32Dll@@YGHPAXI0@Z" \
|
||||
/out:$(NAME).app
|
||||
STAGE1_LINK_FLAGS = $(STAGE_BOTH_LINK_FLAGS) \
|
||||
/incremental:no \
|
||||
|
||||
STAGE2_LINK_FLAGS = $(STAGE_BOTH_LINK_FLAGS) \
|
||||
$(NAME).exp /debug \
|
||||
|
||||
ARCH = series$(SERIES)
|
||||
SYMARCH = SERIES_$(SERIES)
|
||||
|
@ -190,7 +190,7 @@ PKGVERS = $(MAJOR),$(MINOR)
|
|||
MBG = $(NAME).mbg
|
||||
|
||||
#PKGFILES=$(THEAPP) $(NAME).aif $(NAME).rsc $(NAME).mbm BasEnglish2to8.xwd
|
||||
PKGFILES = $(NAME).app $(NAME).rsc $(NAME).mbm BasEnglish2to8.xwd
|
||||
PKGFILES = $(NAME).app $(NAME).rsc $(NAME).mbm $(DICT)
|
||||
|
||||
DEBUG_FLAGS = -DDEBUG -DMEM_DEBUG
|
||||
|
||||
|
@ -244,25 +244,22 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp $(INCLUDES)
|
|||
$(NAME).mbg $(NAME).mbm: $(IMG_SRC)
|
||||
$(BMCONV) /h$(NAME).mbg $(NAME).mbm $(subst ..,/2..,$(IMG_SRC))
|
||||
|
||||
BasEnglish2to8.xwd: ../../dawg/English/BasEnglish2to8.xwd
|
||||
ln -s $< $@
|
||||
|
||||
clean:
|
||||
rm -rf $(GENERATED) $(NAME).aifspec $(OBJECTS) $(MBG) *.mbm *.rpp *.rsc \
|
||||
*.rsg *.app $(UID_CPP)
|
||||
rm -rf $(DESTDIR)/*
|
||||
for f in $(PKGFILES); do rm -f $(DESTDIR)/$$f; done
|
||||
|
||||
#############################################################################
|
||||
# from here down added from the linux build system or stolen from
|
||||
# makefiles generated by the symbian system
|
||||
#############################################################################
|
||||
|
||||
$(UID_CPP):
|
||||
$(UID_CPP): ./bldwin.mk
|
||||
rm -f $@
|
||||
$(ECHO) "// Make-generated uid source file" >> $@
|
||||
$(ECHO) "#include <E32STD.H>" >> $@
|
||||
$(ECHO) "#pragma data_seg(\".E32_UID\")" >> $@
|
||||
$(ECHO) "__WINS_UID(0x10000079,0x$(U2),0x$(U3))" >> $@
|
||||
$(ECHO) "__WINS_UID(0x$(U1),0x$(U2),0x$(U3))" >> $@
|
||||
$(ECHO) "#pragma data_seg()" >> $@
|
||||
|
||||
%.rsc %.rsg: %.rss
|
||||
|
@ -273,12 +270,6 @@ $(UID_CPP):
|
|||
@$(ECHO) "[GENAIF] $*"
|
||||
$(AMP)$(GA) -u 0x$(U3) $< $@
|
||||
|
||||
%.app: %.ex2
|
||||
$(AMP)$(PT) $< $@ -nocall -uid1 0x$(U1) -uid2 0x$(U2) -uid3 0x$(U3)
|
||||
|
||||
%.ex2: %.exp
|
||||
$(AMP)$(LD) $(LDFLAGS) -o $@ $< $(EX) $(OBJECTS) $(LIBS)
|
||||
|
||||
$(NAME).app : $(OBJECTS) $(EDLL_LIB) $(LIBS)
|
||||
@$(ECHO) building $@
|
||||
$(AMP)$(LINK) $(STAGE1_LINK_FLAGS) $(OBJECTS)
|
||||
|
|
Loading…
Reference in a new issue