diff options
| author | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 22:14:34 +0000 |
|---|---|---|
| committer | John-Mark Bell <jmb@netsurf-browser.org> | 2022-11-03 22:17:39 +0000 |
| commit | 7148d165a57695a6ba6c1c66f883d644d47675ba (patch) | |
| tree | 87e85dced3acc7fb16a67dac21c7a7a416c5b707 /frontends | |
| parent | d8977f781478f67ed7484d0deaab5c3b815271f2 (diff) | |
| download | netsurf-7148d165a57695a6ba6c1c66f883d644d47675ba.tar.gz netsurf-7148d165a57695a6ba6c1c66f883d644d47675ba.tar.bz2 | |
RISC OS: conditionally demand ARMEABISupport in !Run
Will only be enabled if an EABI-aware compiler is used to build
the code. At some point, a suitable copy of ARMEABISupport needs
adding to the supplied !System.400.Modules along with licensing
information in the 3rdParty directory.
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/riscos/Makefile | 3 | ||||
| -rw-r--r-- | frontends/riscos/Makefile.tools | 2 | ||||
| -rw-r--r-- | frontends/riscos/scripts/Run | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/frontends/riscos/Makefile b/frontends/riscos/Makefile index 1708220ad..2b595916a 100644 --- a/frontends/riscos/Makefile +++ b/frontends/riscos/Makefile @@ -114,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/' $@ +endif $(FRONTEND_SOURCE_DIR)/appdir/!Help$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Help $(VQ)echo " CP: $@" diff --git a/frontends/riscos/Makefile.tools b/frontends/riscos/Makefile.tools index 8ef4dd019..a5b5cca1e 100644 --- a/frontends/riscos/Makefile.tools +++ b/frontends/riscos/Makefile.tools @@ -16,6 +16,7 @@ ifeq ($(HOST),riscos) EXEEXT := PKG_CONFIG := ZIP := zip + SED := else # Cross-build for RO # Four options are available: @@ -95,4 +96,5 @@ else CXX := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++) PKG_CONFIG = PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig" pkg-config ZIP := $(GCCSDK_INSTALL_CROSSBIN)/zip + SED := sed endif diff --git a/frontends/riscos/scripts/Run b/frontends/riscos/scripts/Run index 94aa933b0..cb78e907e 100644 --- a/frontends/riscos/scripts/Run +++ b/frontends/riscos/scripts/Run @@ -68,6 +68,10 @@ RMEnsure DrawFile 1.30 Error NetSurf requires the DrawFile module. This can be d RMEnsure SharedUnixLibrary 1.07 NetSurfRMLoad System:Modules.SharedULib RMEnsure SharedUnixLibrary 1.07 Error NetSurf requires SharedUnixLibrary 1.07 or later. Please use the RISC OS Configure app to update the computer's !System directory from the NetSurf archive. +| Ensure ARMEABISupport is installed +|RMEnsure ARMEABISupport 1.04 NetSurfRMLoad System:Modules.ARMEABISupport +|RMEnsure ARMEABISupport 1.04 Error NetSurf requires ARMEABISupport 1.04 or later. Please use the RISC OS Configure app to update the computer's !System directory from the NetSurf archive. + | Load AcornURI if it isn't already Unset NetSurf$Start_URI_Handler RMEnsure AcornURI 0.12 Set NetSurf$Start_URI_Handler 1 |