diff options
Diffstat (limited to 'frontends/riscos/Makefile')
| -rw-r--r-- | frontends/riscos/Makefile | 71 |
1 files changed, 56 insertions, 15 deletions
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile index f531b6b5b..265f9289d 100644 --- a/frontends/riscos/Makefile +++ b/frontends/riscos/Makefile @@ -22,6 +22,9 @@ RESOURCES = $(TPD_RISCOS) CFLAGS += -Driscos -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \ -mpoke-function-name -fno-strict-aliasing +ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi) + CFLAGS += -funwind-tables +endif CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include ifeq ($(HOST),riscos) @@ -33,7 +36,7 @@ ifeq ($(HOST),riscos) LDFLAGS += -LOSLib: -lOSLib32 else LDFLAGS += -lOSLib32 - ifeq ($(SUBTARGET),-elf) + ifeq ($(findstring -elf,$(SUBTARGET)),-elf) # Go for static builds & AIF binary at the moment: CFLAGS += -static LDFLAGS += -static @@ -46,17 +49,52 @@ endif # ---------------------------------------------------------------------------- # S_RISCOS are sources purely for the RISC OS build -S_FRONTEND := 401login.c assert.c bitmap.c buffer.c configure.c gui.c \ - dialog.c download.c filetype.c font.c help.c image.c \ - iconbar.c menus.c message.c mouse.c palettes.c plotters.c \ - print.c query.c save.c save_draw.c save_pdf.c schedule.c \ - search.c searchweb.c textarea.c textselection.c theme.c \ - theme_install.c toolbar.c url_suggest.c wimp.c wimp_event.c \ - ucstables.c uri.c url_complete.c url_protocol.c window.c \ - corewindow.c cookies.c sslcert.c hotlist.c \ - local_history.c global_history.c \ - $(addprefix content-handlers/,artworks.c awrender.s draw.c \ - sprite.c) \ +S_FRONTEND := \ + assert.c \ + bitmap.c \ + buffer.c \ + configure.c \ + cookies.c \ + corewindow.c \ + dialog.c \ + download.c \ + filetype.c \ + font.c \ + global_history.c \ + gui.c \ + help.c \ + hotlist.c \ + image.c \ + iconbar.c \ + local_history.c \ + menus.c \ + message.c \ + mouse.c \ + pageinfo.c \ + palettes.c \ + plotters.c \ + print.c \ + query.c \ + save.c \ + save_draw.c \ + save_pdf.c \ + schedule.c \ + search.c \ + searchweb.c \ + textarea.c \ + textselection.c \ + theme.c \ + theme_install.c \ + toolbar.c \ + url_suggest.c \ + ucstables.c \ + uri.c \ + url_complete.c \ + url_protocol.c \ + window.c \ + wimp.c \ + wimp_event.c \ + $(addprefix content-handlers/,artworks.c awrender.s draw.c sprite.c) \ $(addprefix gui/,button_bar.c progress_bar.c status_bar.c \ throbber.c url_bar.c) \ $(addprefix configure/,con_cache.c con_connect.c con_content.c \ @@ -76,6 +114,9 @@ MESSAGES_FILTER=ro $(FRONTEND_SOURCE_DIR)/appdir/!Run$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET) $(VQ)echo " MAKERUN: $@" $(Q)$(MAKERUN) $(EXETARGET) $< $@ +ifeq ($(findstring -elfeabi,$(SUBTARGET)),-elfeabi) + $(Q)$(SED) -i -e 's/^|\(RMEnsure ARMEABISupport\)/\1/' -e 's/SharedUnixLibrary 1\.07/SharedUnixLibrary 1.16/g' $@ +endif $(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Help $(VQ)echo " CP: $@" @@ -139,15 +180,15 @@ install-riscos: package-riscos: netsurf.zip -netsurf.zip: $(EXETARGET) +netsurf.zip: $(EXETARGET) $(POSTEXES) $(eval $@_TMPDIR := $(shell mktemp -d)) $(Q) $(RM) $@ $(Q) cp -rLvp $(FRONTEND_SOURCE_DIR)/appdir $($@_TMPDIR)/!NetSurf - $(Q) $(CURDIR)/utils/git-date.sh $(FRONTEND_SOURCE_DIR)/distribution + $(Q) $(CURDIR)/tools/git-date.sh $(FRONTEND_SOURCE_DIR)/distribution $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!Boot $($@_TMPDIR) $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/!System $($@_TMPDIR) $(Q) rsync --archive --verbose $(FRONTEND_SOURCE_DIR)/distribution/3rdParty $($@_TMPDIR) $(Q) cp $(FRONTEND_SOURCE_DIR)/distribution/ReadMe $($@_TMPDIR) $(Q) cp $(FRONTEND_SOURCE_DIR)/distribution/LeesMij $($@_TMPDIR) - $(Q) cd $($@_TMPDIR) && /opt/netsurf/arm-unknown-riscos/env/bin/zip -9vr\, $(CURDIR)/$@ * + $(Q) cd $($@_TMPDIR) && $(ZIP) -9vr\, $(CURDIR)/$@ * $(Q) $(RM) -rf $($@_TMPDIR) |