diff --git a/.gitignore b/.gitignore index 4102f3eee..89ecd0d0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ *~ -gtk/res/toolbarIndices -windows/res/preferences \!NetSurf/!Run,feb \!NetSurf/!RunImage,ff8 \!NetSurf/!Help,feb @@ -13,11 +11,13 @@ windows/res/preferences \!NetSurf/Resources/nl/Templates,fec \!NetSurf/Resources/nl/Messages \!NetSurf/Resources/it/Messages -gtk/res/en/Messages -gtk/res/fr/Messages -gtk/res/de/Messages -gtk/res/nl/Messages -gtk/res/it/Messages +frontends/windows/res/preferences +frontends/gtk/res/toolbarIndices +frontends/gtk/res/en/Messages +frontends/gtk/res/fr/Messages +frontends/gtk/res/de/Messages +frontends/gtk/res/nl/Messages +frontends/gtk/res/it/Messages test/nsoption test/nsurl test/urldbtest diff --git a/Makefile b/Makefile index d0c072372..c8cf35e45 100644 --- a/Makefile +++ b/Makefile @@ -511,13 +511,36 @@ $(eval $(call pkg_config_find_and_add,libcss,CSS)) $(eval $(call pkg_config_find_and_add,libdom,DOM)) $(eval $(call pkg_config_find_and_add,libnsutils,nsutils)) $(eval $(call pkg_config_find_and_add,libutf8proc,utf8proc)) +$(eval $(call pkg_config_find_and_add,openssl,OpenSSL)) +# freemint does not support pkg-config for libcurl +ifeq ($(HOST),mint) + CFLAGS += $(shell curl-config --cflags) + LDFLAGS += $(shell curl-config --libs) +else + $(eval $(call pkg_config_find_and_add,libcurl,Curl)) +endif # Common libraries without pkg-config support LDFLAGS += -lz +# Optional libraries with pkgconfig + +# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs +NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG +NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP +NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF +NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG +NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE + +$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) +$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) +$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) +$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) + # add top level and build directory to include search path -CFLAGS += -I. -I$(OBJROOT) -CXXFLAGS += -I. -I$(OBJROOT) +CFLAGS += -I. -Ifrontends -I$(OBJROOT) +CXXFLAGS += -I. -Ifrontends -I$(OBJROOT) # export the user agent format CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\" @@ -553,7 +576,7 @@ POSTEXES := # Target specific setup # ---------------------------------------------------------------------------- -include $(TARGET)/Makefile.target +include frontends/Makefile # ---------------------------------------------------------------------------- # General source file setup @@ -647,10 +670,10 @@ else $(Q)$(RM) $(EXETARGET:,ff8=,e1f) endif ifeq ($(TARGET),windows) - $(Q)$(TOUCH) windows/res/preferences + $(Q)$(TOUCH) frontends/windows/res/preferences endif ifeq ($(TARGET),gtk) - $(Q)$(TOUCH) gtk/res/toolbarIndices + $(Q)$(TOUCH) frontends/gtk/res/toolbarIndices endif ifeq ($(NETSURF_STRIP_BINARY),YES) $(VQ)echo " STRIP: $(EXETARGET)" diff --git a/Makefile.defaults b/Makefile.defaults index 09ac2243e..196e19236 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -125,7 +125,7 @@ endif # ---------------------------------------------------------------------------- # Option overrides determined by specific TARGET # ---------------------------------------------------------------------------- --include $(TARGET)/Makefile.defaults +-include frontends/$(TARGET)/Makefile.defaults # ---------------------------------------------------------------------------- diff --git a/beos/Makefile.target b/beos/Makefile.target deleted file mode 100644 index 382b32736..000000000 --- a/beos/Makefile.target +++ /dev/null @@ -1,156 +0,0 @@ -# ---------------------------------------------------------------------------- -# BeOS target setup -# ---------------------------------------------------------------------------- - -$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) -$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) - -# Linker flags -LDFLAGS += -L/boot/home/config/lib -# for Haiku -LDFLAGS += -L/boot/common/lib -LDFLAGS += -lssl -lcrypto -lcss -LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet -LDFLAGS += -lexpat -lcurl - -COMMON_WARNFLAGS += -Wno-multichar - -# compiler flags -CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g -CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g - -BEOS_BERES := beres -BEOS_RC := rc -BEOS_XRES := xres -BEOS_SETVER := setversion -BEOS_MIMESET := mimeset - -VERSION_FULL := $(shell sed -n '/_version.*=.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) -VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) -VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) - -ifeq ($(HOST),beos) - CFLAGS += -I/boot/home/config/include \ - -I/boot/home/config/include/hubbub \ - -I/boot/home/config/include/libcss \ - -I/boot/home/config/include/parserutils - CXXFLAGS += -I/boot/home/config/include \ - -I/boot/home/config/include/hubbub \ - -I/boot/home/config/include/libcss \ - -I/boot/home/config/include/parserutils - ifneq ($(wildcard /boot/develop/lib/*/libzeta.so),) - LDFLAGS += -lzeta - endif - ifneq ($(wildcard /boot/system/develop/lib/libnetwork.so),) - # Haiku - NETLDFLAGS := -lnetwork - else - ifneq ($(wildcard /boot/develop/lib/*/libbind.so),) - # BONE - NETLDFLAGS := -lsocket -lbind - else - # net_server, will probably never work - NETLDFLAGS := -lnet - endif - endif -else - # cross: Haiku ? - NETLDFLAGS := -lnetwork -endif - -LDFLAGS += -lbe -ltranslation -ltracker -lcolumnlistview $(NETLDFLAGS) -ifeq ($(CC_MAJOR),2) - LDFLAGS += -lstdc++.r4 -else - LDFLAGS += -lstdc++ -lsupc++ -endif - -ifeq ($(HOST),beos) - CFLAGS += -I$(PREFIX)/include - CXXFLAGS += -I$(PREFIX)/include - LDFLAGS += -L$(PREFIX)/lib - $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) - $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) - $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) -else - NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP - NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF - NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG - $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) - $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) - $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) -endif - -# ---------------------------------------------------------------------------- -# Source file setup -# ---------------------------------------------------------------------------- - -# S_BEOS are sources purely for the BeOS build -S_BEOS := about.cpp bitmap.cpp cookies.cpp \ - download.cpp fetch_rsrc.cpp filetype.cpp \ - font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp \ - scaffolding.cpp search.cpp schedule.cpp throbber.cpp window.cpp -S_BEOS := $(addprefix beos/,$(S_BEOS)) - -RDEF_BEOS := res.rdef -RDEF_BEOS := $(addprefix beos/,$(RDEF_BEOS)) - -RDEF_IMP_BEOS := res_import.rdef -RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS))) - -RDEP_BEOS := \ - adblock.css beosdefault.css default.css internal.css quirks.css \ - netsurf.png favicon.png ca-bundle.txt \ - credits.html licence.html welcome.html maps.html SearchEngines -RDEP_BEOS := $(addprefix beos/res/,$(RDEP_BEOS)) \ - $(wildcard beos/res/icons/*.png) \ - $(wildcard beos/res/??/*) \ - $(wildcard beos/res/throbber/throbber*.png) - - -# This is the final source build list -# Note this is deliberately *not* expanded here as common and image -# are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_BEOS) -EXETARGET := NetSurf - -# The filter and target for split messages -MESSAGES_FILTER=beos -MESSAGES_TARGET=beos/res - -# ---------------------------------------------------------------------------- -# Resources -# ---------------------------------------------------------------------------- - -RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) -RESOURCES = $(RSRC_BEOS) - -$(RDEF_IMP_BEOS): $(RDEP_BEOS) - $(VQ)echo " GEN: $@" - $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ - -$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) - $(VQ)echo " RC: $<" - $(Q)$(BEOS_RC) -I beos -o $@ $^ - - -# ---------------------------------------------------------------------------- -# Install target -# ---------------------------------------------------------------------------- - -install-beos: - mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN) - mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf - @cp -vRL beos/res/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - @cp -vRL beos/res/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - @cp -vRL beos/res/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - @cp -vRL beos/res/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - @cp -vRL gtk/res/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - @cp -vRL beos/res/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES) - -# ---------------------------------------------------------------------------- -# Package target -# ---------------------------------------------------------------------------- - -package-beos: diff --git a/cocoa/res/Icons b/cocoa/res/Icons deleted file mode 120000 index 509ccd1d2..000000000 --- a/cocoa/res/Icons +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/Icons/ \ No newline at end of file diff --git a/cocoa/res/adblock.css b/cocoa/res/adblock.css deleted file mode 120000 index e3811f62b..000000000 --- a/cocoa/res/adblock.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/cocoa/res/ca-bundle b/cocoa/res/ca-bundle deleted file mode 120000 index ad2dd6b55..000000000 --- a/cocoa/res/ca-bundle +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/ca-bundle \ No newline at end of file diff --git a/cocoa/res/de.lproj/Messages b/cocoa/res/de.lproj/Messages deleted file mode 120000 index 2f1fc39c3..000000000 --- a/cocoa/res/de.lproj/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/de/Messages \ No newline at end of file diff --git a/cocoa/res/default.css b/cocoa/res/default.css deleted file mode 120000 index 6d2d4da5b..000000000 --- a/cocoa/res/default.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/cocoa/res/fr.lproj/Messages b/cocoa/res/fr.lproj/Messages deleted file mode 120000 index a42cf08f4..000000000 --- a/cocoa/res/fr.lproj/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/fr/Messages \ No newline at end of file diff --git a/cocoa/res/internal.css b/cocoa/res/internal.css deleted file mode 120000 index e777d8ae1..000000000 --- a/cocoa/res/internal.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/cocoa/res/it.lproj/Messages b/cocoa/res/it.lproj/Messages deleted file mode 120000 index d4c5c2956..000000000 --- a/cocoa/res/it.lproj/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/it/Messages \ No newline at end of file diff --git a/cocoa/res/netsurf.png b/cocoa/res/netsurf.png deleted file mode 120000 index 0fbf42709..000000000 --- a/cocoa/res/netsurf.png +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/cocoa/res/nl.lproj/Messages b/cocoa/res/nl.lproj/Messages deleted file mode 120000 index d484ebd29..000000000 --- a/cocoa/res/nl.lproj/Messages +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/nl/Messages \ No newline at end of file diff --git a/cocoa/res/quirks.css b/cocoa/res/quirks.css deleted file mode 120000 index d9fb80334..000000000 --- a/cocoa/res/quirks.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/framebuffer/res/Messages b/framebuffer/res/Messages deleted file mode 120000 index f4a4d2bba..000000000 --- a/framebuffer/res/Messages +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/framebuffer/res/adblock.css b/framebuffer/res/adblock.css deleted file mode 120000 index e3811f62b..000000000 --- a/framebuffer/res/adblock.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/framebuffer/res/credits.html b/framebuffer/res/credits.html deleted file mode 120000 index db395bb5a..000000000 --- a/framebuffer/res/credits.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/credits.html,faf \ No newline at end of file diff --git a/framebuffer/res/default.css b/framebuffer/res/default.css deleted file mode 120000 index 6d2d4da5b..000000000 --- a/framebuffer/res/default.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/framebuffer/res/favicon.png b/framebuffer/res/favicon.png deleted file mode 120000 index d968c3827..000000000 --- a/framebuffer/res/favicon.png +++ /dev/null @@ -1 +0,0 @@ -../../gtk/res/favicon.png \ No newline at end of file diff --git a/framebuffer/res/internal.css b/framebuffer/res/internal.css deleted file mode 120000 index e777d8ae1..000000000 --- a/framebuffer/res/internal.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/framebuffer/res/licence.html b/framebuffer/res/licence.html deleted file mode 120000 index a5f990304..000000000 --- a/framebuffer/res/licence.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/licence.html,faf \ No newline at end of file diff --git a/framebuffer/res/maps.html b/framebuffer/res/maps.html deleted file mode 120000 index 5b394445b..000000000 --- a/framebuffer/res/maps.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file diff --git a/framebuffer/res/netsurf.png b/framebuffer/res/netsurf.png deleted file mode 120000 index 0fbf42709..000000000 --- a/framebuffer/res/netsurf.png +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/framebuffer/res/quirks.css b/framebuffer/res/quirks.css deleted file mode 120000 index d9fb80334..000000000 --- a/framebuffer/res/quirks.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/framebuffer/res/welcome.html b/framebuffer/res/welcome.html deleted file mode 120000 index 5b394445b..000000000 --- a/framebuffer/res/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file diff --git a/frontends/Makefile b/frontends/Makefile new file mode 100644 index 000000000..da6fe2019 --- /dev/null +++ b/frontends/Makefile @@ -0,0 +1,9 @@ +# NetSurf Frontend sources + +FRONTEND_SOURCE_DIR := frontends/$(TARGET) +FRONTEND_RESOURCES_DIR := frontends/$(TARGET)/res + +# Target Specific setup +include frontends/$(TARGET)/Makefile + +S_FRONTEND := $(addprefix frontends/$(TARGET)/,$(S_FRONTEND)) diff --git a/amiga/Makefile.target b/frontends/amiga/Makefile similarity index 83% rename from amiga/Makefile.target rename to frontends/amiga/Makefile index 54957f778..a5e9d1c1f 100644 --- a/amiga/Makefile.target +++ b/frontends/amiga/Makefile @@ -33,17 +33,10 @@ ifeq ($(HOST),amiga) LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lpbl LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet else - $(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) - $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) - $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) - $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) - $(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,NSSVG)) - $(eval $(call feature_enabled,MOZJS,-DXP_AMIGA -DWITH_MOZJS -DJS_VERSION=170 -DJSVERSION_LATEST=170 -DJSOPTION_JIT=0 -DJSCLASS_GLOBAL_FLAGS=0,-ljs,JavaScript)) $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon)) $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include - CFLAGS += $(shell $(PKG_CONFIG) --cflags libcurl openssl) CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl) @@ -66,23 +59,22 @@ MESSAGES_FILTER=ami # Source file setup # ---------------------------------------------------------------------------- -# S_AMIGA are sources purely for the Amiga build -S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c file.c \ - misc.c bitmap.c font.c filetype.c utf8.c login.c \ +# sources purely for the Amiga build +S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c file.c \ + misc.c bitmap.c font.c filetype.c utf8.c login.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ - cookies.c ctxmenu.c clipboard.c help.c font_scan.c \ + cookies.c ctxmenu.c clipboard.c help.c font_scan.c \ launch.c search.c history_local.c download.c iff_dr2d.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c libs.c \ datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c rtg.c \ agclass/amigaguide_class.c os3support.c font_diskfont.c \ selectmenu.c hash/xxhash.c font_cache.c font_bullet.c -S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) # ---------------------------------------------------------------------------- # Install target @@ -99,8 +91,8 @@ package-amiga: netsurf.lha AMIGA_LANGUAGES := de en it ja nl AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle Icons -AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) -AMIGA_DISTRIBUTION_FILES := amiga/dist/* +AMIGA_RESOURCES := $(addprefix $(FRONTEND_SOURCE_DIR)/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES)) +AMIGA_DISTRIBUTION_FILES := $(FRONTEND_SOURCE_DIR)/dist/* AMIGA_INSTALL_TARGET_DIR := NetSurf_Amiga netsurf.lha: $(EXETARGET) diff --git a/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults similarity index 100% rename from amiga/Makefile.defaults rename to frontends/amiga/Makefile.defaults diff --git a/amiga/agclass/amigaguide_class.c b/frontends/amiga/agclass/amigaguide_class.c similarity index 100% rename from amiga/agclass/amigaguide_class.c rename to frontends/amiga/agclass/amigaguide_class.c diff --git a/amiga/agclass/amigaguide_class.h b/frontends/amiga/agclass/amigaguide_class.h similarity index 100% rename from amiga/agclass/amigaguide_class.h rename to frontends/amiga/agclass/amigaguide_class.h diff --git a/amiga/arexx.c b/frontends/amiga/arexx.c similarity index 100% rename from amiga/arexx.c rename to frontends/amiga/arexx.c diff --git a/amiga/arexx.h b/frontends/amiga/arexx.h similarity index 100% rename from amiga/arexx.h rename to frontends/amiga/arexx.h diff --git a/amiga/bitmap.c b/frontends/amiga/bitmap.c similarity index 100% rename from amiga/bitmap.c rename to frontends/amiga/bitmap.c diff --git a/amiga/bitmap.h b/frontends/amiga/bitmap.h similarity index 100% rename from amiga/bitmap.h rename to frontends/amiga/bitmap.h diff --git a/amiga/clipboard.c b/frontends/amiga/clipboard.c similarity index 100% rename from amiga/clipboard.c rename to frontends/amiga/clipboard.c diff --git a/amiga/clipboard.h b/frontends/amiga/clipboard.h similarity index 100% rename from amiga/clipboard.h rename to frontends/amiga/clipboard.h diff --git a/amiga/cookies.c b/frontends/amiga/cookies.c similarity index 100% rename from amiga/cookies.c rename to frontends/amiga/cookies.c diff --git a/amiga/cookies.h b/frontends/amiga/cookies.h similarity index 100% rename from amiga/cookies.h rename to frontends/amiga/cookies.h diff --git a/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c similarity index 100% rename from amiga/ctxmenu.c rename to frontends/amiga/ctxmenu.c diff --git a/amiga/ctxmenu.h b/frontends/amiga/ctxmenu.h similarity index 100% rename from amiga/ctxmenu.h rename to frontends/amiga/ctxmenu.h diff --git a/amiga/datatypes.c b/frontends/amiga/datatypes.c similarity index 100% rename from amiga/datatypes.c rename to frontends/amiga/datatypes.c diff --git a/amiga/datatypes.h b/frontends/amiga/datatypes.h similarity index 100% rename from amiga/datatypes.h rename to frontends/amiga/datatypes.h diff --git a/amiga/dist/Install b/frontends/amiga/dist/Install similarity index 100% rename from amiga/dist/Install rename to frontends/amiga/dist/Install diff --git a/amiga/dist/Install.info b/frontends/amiga/dist/Install.info similarity index 100% rename from amiga/dist/Install.info rename to frontends/amiga/dist/Install.info diff --git a/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide similarity index 100% rename from amiga/dist/NetSurf.guide rename to frontends/amiga/dist/NetSurf.guide diff --git a/amiga/dist/NetSurf.guide.info b/frontends/amiga/dist/NetSurf.guide.info similarity index 100% rename from amiga/dist/NetSurf.guide.info rename to frontends/amiga/dist/NetSurf.guide.info diff --git a/amiga/dist/Rexx.info b/frontends/amiga/dist/Rexx.info similarity index 100% rename from amiga/dist/Rexx.info rename to frontends/amiga/dist/Rexx.info diff --git a/amiga/dist/Rexx/CloseTabs.nsrx b/frontends/amiga/dist/Rexx/CloseTabs.nsrx similarity index 100% rename from amiga/dist/Rexx/CloseTabs.nsrx rename to frontends/amiga/dist/Rexx/CloseTabs.nsrx diff --git a/amiga/dist/Rexx/SMTube.nsrx b/frontends/amiga/dist/Rexx/SMTube.nsrx similarity index 100% rename from amiga/dist/Rexx/SMTube.nsrx rename to frontends/amiga/dist/Rexx/SMTube.nsrx diff --git a/amiga/dist/Rexx/ShowTitles.nsrx b/frontends/amiga/dist/Rexx/ShowTitles.nsrx similarity index 100% rename from amiga/dist/Rexx/ShowTitles.nsrx rename to frontends/amiga/dist/Rexx/ShowTitles.nsrx diff --git a/amiga/dist/Rexx/viewsource.nsrx b/frontends/amiga/dist/Rexx/viewsource.nsrx similarity index 100% rename from amiga/dist/Rexx/viewsource.nsrx rename to frontends/amiga/dist/Rexx/viewsource.nsrx diff --git a/amiga/download.c b/frontends/amiga/download.c similarity index 100% rename from amiga/download.c rename to frontends/amiga/download.c diff --git a/amiga/download.h b/frontends/amiga/download.h similarity index 100% rename from amiga/download.h rename to frontends/amiga/download.h diff --git a/amiga/drag.c b/frontends/amiga/drag.c similarity index 100% rename from amiga/drag.c rename to frontends/amiga/drag.c diff --git a/amiga/drag.h b/frontends/amiga/drag.h similarity index 100% rename from amiga/drag.h rename to frontends/amiga/drag.h diff --git a/amiga/dt_anim.c b/frontends/amiga/dt_anim.c similarity index 100% rename from amiga/dt_anim.c rename to frontends/amiga/dt_anim.c diff --git a/amiga/dt_picture.c b/frontends/amiga/dt_picture.c similarity index 100% rename from amiga/dt_picture.c rename to frontends/amiga/dt_picture.c diff --git a/amiga/dt_sound.c b/frontends/amiga/dt_sound.c similarity index 100% rename from amiga/dt_sound.c rename to frontends/amiga/dt_sound.c diff --git a/amiga/file.c b/frontends/amiga/file.c similarity index 100% rename from amiga/file.c rename to frontends/amiga/file.c diff --git a/amiga/file.h b/frontends/amiga/file.h similarity index 100% rename from amiga/file.h rename to frontends/amiga/file.h diff --git a/amiga/filetype.c b/frontends/amiga/filetype.c similarity index 100% rename from amiga/filetype.c rename to frontends/amiga/filetype.c diff --git a/amiga/filetype.h b/frontends/amiga/filetype.h similarity index 100% rename from amiga/filetype.h rename to frontends/amiga/filetype.h diff --git a/amiga/font.c b/frontends/amiga/font.c similarity index 100% rename from amiga/font.c rename to frontends/amiga/font.c diff --git a/amiga/font.h b/frontends/amiga/font.h similarity index 100% rename from amiga/font.h rename to frontends/amiga/font.h diff --git a/amiga/font_bullet.c b/frontends/amiga/font_bullet.c similarity index 100% rename from amiga/font_bullet.c rename to frontends/amiga/font_bullet.c diff --git a/amiga/font_bullet.h b/frontends/amiga/font_bullet.h similarity index 100% rename from amiga/font_bullet.h rename to frontends/amiga/font_bullet.h diff --git a/amiga/font_cache.c b/frontends/amiga/font_cache.c similarity index 100% rename from amiga/font_cache.c rename to frontends/amiga/font_cache.c diff --git a/amiga/font_cache.h b/frontends/amiga/font_cache.h similarity index 100% rename from amiga/font_cache.h rename to frontends/amiga/font_cache.h diff --git a/amiga/font_diskfont.c b/frontends/amiga/font_diskfont.c similarity index 100% rename from amiga/font_diskfont.c rename to frontends/amiga/font_diskfont.c diff --git a/amiga/font_diskfont.h b/frontends/amiga/font_diskfont.h similarity index 100% rename from amiga/font_diskfont.h rename to frontends/amiga/font_diskfont.h diff --git a/amiga/font_scan.c b/frontends/amiga/font_scan.c similarity index 100% rename from amiga/font_scan.c rename to frontends/amiga/font_scan.c diff --git a/amiga/font_scan.h b/frontends/amiga/font_scan.h similarity index 100% rename from amiga/font_scan.h rename to frontends/amiga/font_scan.h diff --git a/amiga/gui.c b/frontends/amiga/gui.c similarity index 100% rename from amiga/gui.c rename to frontends/amiga/gui.c diff --git a/amiga/gui.h b/frontends/amiga/gui.h similarity index 100% rename from amiga/gui.h rename to frontends/amiga/gui.h diff --git a/amiga/gui_options.c b/frontends/amiga/gui_options.c similarity index 100% rename from amiga/gui_options.c rename to frontends/amiga/gui_options.c diff --git a/amiga/gui_options.h b/frontends/amiga/gui_options.h similarity index 100% rename from amiga/gui_options.h rename to frontends/amiga/gui_options.h diff --git a/amiga/hash/xxhash.c b/frontends/amiga/hash/xxhash.c similarity index 100% rename from amiga/hash/xxhash.c rename to frontends/amiga/hash/xxhash.c diff --git a/amiga/hash/xxhash.h b/frontends/amiga/hash/xxhash.h similarity index 100% rename from amiga/hash/xxhash.h rename to frontends/amiga/hash/xxhash.h diff --git a/amiga/help.c b/frontends/amiga/help.c similarity index 100% rename from amiga/help.c rename to frontends/amiga/help.c diff --git a/amiga/help.h b/frontends/amiga/help.h similarity index 100% rename from amiga/help.h rename to frontends/amiga/help.h diff --git a/amiga/history.c b/frontends/amiga/history.c similarity index 100% rename from amiga/history.c rename to frontends/amiga/history.c diff --git a/amiga/history.h b/frontends/amiga/history.h similarity index 100% rename from amiga/history.h rename to frontends/amiga/history.h diff --git a/amiga/history_local.c b/frontends/amiga/history_local.c similarity index 100% rename from amiga/history_local.c rename to frontends/amiga/history_local.c diff --git a/amiga/history_local.h b/frontends/amiga/history_local.h similarity index 100% rename from amiga/history_local.h rename to frontends/amiga/history_local.h diff --git a/amiga/hotlist.c b/frontends/amiga/hotlist.c similarity index 100% rename from amiga/hotlist.c rename to frontends/amiga/hotlist.c diff --git a/amiga/hotlist.h b/frontends/amiga/hotlist.h similarity index 100% rename from amiga/hotlist.h rename to frontends/amiga/hotlist.h diff --git a/amiga/icon.c b/frontends/amiga/icon.c similarity index 100% rename from amiga/icon.c rename to frontends/amiga/icon.c diff --git a/amiga/icon.h b/frontends/amiga/icon.h similarity index 100% rename from amiga/icon.h rename to frontends/amiga/icon.h diff --git a/amiga/iff_cset.h b/frontends/amiga/iff_cset.h similarity index 100% rename from amiga/iff_cset.h rename to frontends/amiga/iff_cset.h diff --git a/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c similarity index 100% rename from amiga/iff_dr2d.c rename to frontends/amiga/iff_dr2d.c diff --git a/amiga/iff_dr2d.h b/frontends/amiga/iff_dr2d.h similarity index 100% rename from amiga/iff_dr2d.h rename to frontends/amiga/iff_dr2d.h diff --git a/amiga/launch.c b/frontends/amiga/launch.c similarity index 100% rename from amiga/launch.c rename to frontends/amiga/launch.c diff --git a/amiga/launch.h b/frontends/amiga/launch.h similarity index 100% rename from amiga/launch.h rename to frontends/amiga/launch.h diff --git a/amiga/libs.c b/frontends/amiga/libs.c similarity index 100% rename from amiga/libs.c rename to frontends/amiga/libs.c diff --git a/amiga/libs.h b/frontends/amiga/libs.h similarity index 100% rename from amiga/libs.h rename to frontends/amiga/libs.h diff --git a/amiga/login.c b/frontends/amiga/login.c similarity index 100% rename from amiga/login.c rename to frontends/amiga/login.c diff --git a/amiga/login.h b/frontends/amiga/login.h similarity index 100% rename from amiga/login.h rename to frontends/amiga/login.h diff --git a/amiga/menu.c b/frontends/amiga/menu.c similarity index 100% rename from amiga/menu.c rename to frontends/amiga/menu.c diff --git a/amiga/menu.h b/frontends/amiga/menu.h similarity index 100% rename from amiga/menu.h rename to frontends/amiga/menu.h diff --git a/amiga/misc.c b/frontends/amiga/misc.c similarity index 100% rename from amiga/misc.c rename to frontends/amiga/misc.c diff --git a/amiga/misc.h b/frontends/amiga/misc.h similarity index 100% rename from amiga/misc.h rename to frontends/amiga/misc.h diff --git a/amiga/object.c b/frontends/amiga/object.c similarity index 100% rename from amiga/object.c rename to frontends/amiga/object.c diff --git a/amiga/object.h b/frontends/amiga/object.h similarity index 100% rename from amiga/object.h rename to frontends/amiga/object.h diff --git a/amiga/options.h b/frontends/amiga/options.h similarity index 100% rename from amiga/options.h rename to frontends/amiga/options.h diff --git a/amiga/os3support.c b/frontends/amiga/os3support.c similarity index 100% rename from amiga/os3support.c rename to frontends/amiga/os3support.c diff --git a/amiga/os3support.h b/frontends/amiga/os3support.h similarity index 100% rename from amiga/os3support.h rename to frontends/amiga/os3support.h diff --git a/amiga/pkg/AutoInstall b/frontends/amiga/pkg/AutoInstall similarity index 100% rename from amiga/pkg/AutoInstall rename to frontends/amiga/pkg/AutoInstall diff --git a/amiga/pkg/drawer.info b/frontends/amiga/pkg/drawer.info similarity index 100% rename from amiga/pkg/drawer.info rename to frontends/amiga/pkg/drawer.info diff --git a/amiga/pkg/makepackage b/frontends/amiga/pkg/makepackage similarity index 100% rename from amiga/pkg/makepackage rename to frontends/amiga/pkg/makepackage diff --git a/amiga/pkg/makereslinks b/frontends/amiga/pkg/makereslinks similarity index 100% rename from amiga/pkg/makereslinks rename to frontends/amiga/pkg/makereslinks diff --git a/amiga/pkg/netsurf.readme b/frontends/amiga/pkg/netsurf.readme similarity index 100% rename from amiga/pkg/netsurf.readme rename to frontends/amiga/pkg/netsurf.readme diff --git a/amiga/pkg/netsurf.readme.info b/frontends/amiga/pkg/netsurf.readme.info similarity index 100% rename from amiga/pkg/netsurf.readme.info rename to frontends/amiga/pkg/netsurf.readme.info diff --git a/amiga/pkg/netsurf_os3.readme b/frontends/amiga/pkg/netsurf_os3.readme similarity index 100% rename from amiga/pkg/netsurf_os3.readme rename to frontends/amiga/pkg/netsurf_os3.readme diff --git a/amiga/pkg/netsurf_os3.readme.info b/frontends/amiga/pkg/netsurf_os3.readme.info similarity index 100% rename from amiga/pkg/netsurf_os3.readme.info rename to frontends/amiga/pkg/netsurf_os3.readme.info diff --git a/amiga/plotters.c b/frontends/amiga/plotters.c similarity index 100% rename from amiga/plotters.c rename to frontends/amiga/plotters.c diff --git a/amiga/plotters.h b/frontends/amiga/plotters.h similarity index 100% rename from amiga/plotters.h rename to frontends/amiga/plotters.h diff --git a/amiga/plugin_hack.c b/frontends/amiga/plugin_hack.c similarity index 100% rename from amiga/plugin_hack.c rename to frontends/amiga/plugin_hack.c diff --git a/amiga/plugin_hack.h b/frontends/amiga/plugin_hack.h similarity index 100% rename from amiga/plugin_hack.h rename to frontends/amiga/plugin_hack.h diff --git a/amiga/print.c b/frontends/amiga/print.c similarity index 100% rename from amiga/print.c rename to frontends/amiga/print.c diff --git a/amiga/print.h b/frontends/amiga/print.h similarity index 100% rename from amiga/print.h rename to frontends/amiga/print.h diff --git a/amiga/resources/AdBlock.css b/frontends/amiga/resources/AdBlock.css similarity index 100% rename from amiga/resources/AdBlock.css rename to frontends/amiga/resources/AdBlock.css diff --git a/amiga/resources/LangNames b/frontends/amiga/resources/LangNames similarity index 100% rename from amiga/resources/LangNames rename to frontends/amiga/resources/LangNames diff --git a/amiga/resources/Pointers/Blank b/frontends/amiga/resources/Pointers/Blank similarity index 100% rename from amiga/resources/Pointers/Blank rename to frontends/amiga/resources/Pointers/Blank diff --git a/amiga/resources/Pointers/Blank.info b/frontends/amiga/resources/Pointers/Blank.info similarity index 100% rename from amiga/resources/Pointers/Blank.info rename to frontends/amiga/resources/Pointers/Blank.info diff --git a/amiga/resources/Pointers/Caret b/frontends/amiga/resources/Pointers/Caret similarity index 100% rename from amiga/resources/Pointers/Caret rename to frontends/amiga/resources/Pointers/Caret diff --git a/amiga/resources/Pointers/Caret.info b/frontends/amiga/resources/Pointers/Caret.info similarity index 100% rename from amiga/resources/Pointers/Caret.info rename to frontends/amiga/resources/Pointers/Caret.info diff --git a/amiga/resources/Pointers/Cross.info b/frontends/amiga/resources/Pointers/Cross.info similarity index 100% rename from amiga/resources/Pointers/Cross.info rename to frontends/amiga/resources/Pointers/Cross.info diff --git a/amiga/resources/Pointers/Default b/frontends/amiga/resources/Pointers/Default similarity index 100% rename from amiga/resources/Pointers/Default rename to frontends/amiga/resources/Pointers/Default diff --git a/amiga/resources/Pointers/Default.info b/frontends/amiga/resources/Pointers/Default.info similarity index 100% rename from amiga/resources/Pointers/Default.info rename to frontends/amiga/resources/Pointers/Default.info diff --git a/amiga/resources/Pointers/Down.info b/frontends/amiga/resources/Pointers/Down.info similarity index 100% rename from amiga/resources/Pointers/Down.info rename to frontends/amiga/resources/Pointers/Down.info diff --git a/amiga/resources/Pointers/Drag.info b/frontends/amiga/resources/Pointers/Drag.info similarity index 100% rename from amiga/resources/Pointers/Drag.info rename to frontends/amiga/resources/Pointers/Drag.info diff --git a/amiga/resources/Pointers/Help.info b/frontends/amiga/resources/Pointers/Help.info similarity index 100% rename from amiga/resources/Pointers/Help.info rename to frontends/amiga/resources/Pointers/Help.info diff --git a/amiga/resources/Pointers/Left.info b/frontends/amiga/resources/Pointers/Left.info similarity index 100% rename from amiga/resources/Pointers/Left.info rename to frontends/amiga/resources/Pointers/Left.info diff --git a/amiga/resources/Pointers/LeftDown.info b/frontends/amiga/resources/Pointers/LeftDown.info similarity index 100% rename from amiga/resources/Pointers/LeftDown.info rename to frontends/amiga/resources/Pointers/LeftDown.info diff --git a/amiga/resources/Pointers/LeftUp.info b/frontends/amiga/resources/Pointers/LeftUp.info similarity index 100% rename from amiga/resources/Pointers/LeftUp.info rename to frontends/amiga/resources/Pointers/LeftUp.info diff --git a/amiga/resources/Pointers/Menu b/frontends/amiga/resources/Pointers/Menu similarity index 100% rename from amiga/resources/Pointers/Menu rename to frontends/amiga/resources/Pointers/Menu diff --git a/amiga/resources/Pointers/Menu.info b/frontends/amiga/resources/Pointers/Menu.info similarity index 100% rename from amiga/resources/Pointers/Menu.info rename to frontends/amiga/resources/Pointers/Menu.info diff --git a/amiga/resources/Pointers/Move b/frontends/amiga/resources/Pointers/Move similarity index 100% rename from amiga/resources/Pointers/Move rename to frontends/amiga/resources/Pointers/Move diff --git a/amiga/resources/Pointers/Move.info b/frontends/amiga/resources/Pointers/Move.info similarity index 100% rename from amiga/resources/Pointers/Move.info rename to frontends/amiga/resources/Pointers/Move.info diff --git a/amiga/resources/Pointers/NoDrop.info b/frontends/amiga/resources/Pointers/NoDrop.info similarity index 100% rename from amiga/resources/Pointers/NoDrop.info rename to frontends/amiga/resources/Pointers/NoDrop.info diff --git a/amiga/resources/Pointers/NotAllowed.info b/frontends/amiga/resources/Pointers/NotAllowed.info similarity index 100% rename from amiga/resources/Pointers/NotAllowed.info rename to frontends/amiga/resources/Pointers/NotAllowed.info diff --git a/amiga/resources/Pointers/Point b/frontends/amiga/resources/Pointers/Point similarity index 100% rename from amiga/resources/Pointers/Point rename to frontends/amiga/resources/Pointers/Point diff --git a/amiga/resources/Pointers/Point.info b/frontends/amiga/resources/Pointers/Point.info similarity index 100% rename from amiga/resources/Pointers/Point.info rename to frontends/amiga/resources/Pointers/Point.info diff --git a/amiga/resources/Pointers/Progress.info b/frontends/amiga/resources/Pointers/Progress.info similarity index 100% rename from amiga/resources/Pointers/Progress.info rename to frontends/amiga/resources/Pointers/Progress.info diff --git a/amiga/resources/Pointers/Right.info b/frontends/amiga/resources/Pointers/Right.info similarity index 100% rename from amiga/resources/Pointers/Right.info rename to frontends/amiga/resources/Pointers/Right.info diff --git a/amiga/resources/Pointers/RightDown.info b/frontends/amiga/resources/Pointers/RightDown.info similarity index 100% rename from amiga/resources/Pointers/RightDown.info rename to frontends/amiga/resources/Pointers/RightDown.info diff --git a/amiga/resources/Pointers/RightUp.info b/frontends/amiga/resources/Pointers/RightUp.info similarity index 100% rename from amiga/resources/Pointers/RightUp.info rename to frontends/amiga/resources/Pointers/RightUp.info diff --git a/amiga/resources/Pointers/Up.info b/frontends/amiga/resources/Pointers/Up.info similarity index 100% rename from amiga/resources/Pointers/Up.info rename to frontends/amiga/resources/Pointers/Up.info diff --git a/amiga/resources/Pointers/Wait b/frontends/amiga/resources/Pointers/Wait similarity index 100% rename from amiga/resources/Pointers/Wait rename to frontends/amiga/resources/Pointers/Wait diff --git a/amiga/resources/Pointers/Wait.info b/frontends/amiga/resources/Pointers/Wait.info similarity index 100% rename from amiga/resources/Pointers/Wait.info rename to frontends/amiga/resources/Pointers/Wait.info diff --git a/amiga/resources/Resource.map b/frontends/amiga/resources/Resource.map similarity index 100% rename from amiga/resources/Resource.map rename to frontends/amiga/resources/Resource.map diff --git a/amiga/resources/SearchEngines b/frontends/amiga/resources/SearchEngines similarity index 100% rename from amiga/resources/SearchEngines rename to frontends/amiga/resources/SearchEngines diff --git a/amiga/resources/Themes/AISS/NetSurf.info b/frontends/amiga/resources/Themes/AISS/NetSurf.info similarity index 100% rename from amiga/resources/Themes/AISS/NetSurf.info rename to frontends/amiga/resources/Themes/AISS/NetSurf.info diff --git a/amiga/resources/Themes/AISS/Resource.map b/frontends/amiga/resources/Themes/AISS/Resource.map similarity index 100% rename from amiga/resources/Themes/AISS/Resource.map rename to frontends/amiga/resources/Themes/AISS/Resource.map diff --git a/amiga/resources/Themes/AISS/Theme b/frontends/amiga/resources/Themes/AISS/Theme similarity index 100% rename from amiga/resources/Themes/AISS/Theme rename to frontends/amiga/resources/Themes/AISS/Theme diff --git a/amiga/resources/Themes/AISS/Throbber b/frontends/amiga/resources/Themes/AISS/Throbber similarity index 100% rename from amiga/resources/Themes/AISS/Throbber rename to frontends/amiga/resources/Themes/AISS/Throbber diff --git a/amiga/resources/Themes/Default/NetSurf.info b/frontends/amiga/resources/Themes/Default/NetSurf.info similarity index 100% rename from amiga/resources/Themes/Default/NetSurf.info rename to frontends/amiga/resources/Themes/Default/NetSurf.info diff --git a/amiga/resources/Themes/Default/Theme b/frontends/amiga/resources/Themes/Default/Theme similarity index 100% rename from amiga/resources/Themes/Default/Theme rename to frontends/amiga/resources/Themes/Default/Theme diff --git a/amiga/resources/Themes/Default/Throbber b/frontends/amiga/resources/Themes/Default/Throbber similarity index 100% rename from amiga/resources/Themes/Default/Throbber rename to frontends/amiga/resources/Themes/Default/Throbber diff --git a/amiga/resources/Themes/Default/back.png b/frontends/amiga/resources/Themes/Default/back.png similarity index 100% rename from amiga/resources/Themes/Default/back.png rename to frontends/amiga/resources/Themes/Default/back.png diff --git a/amiga/resources/Themes/Default/back_g.png b/frontends/amiga/resources/Themes/Default/back_g.png similarity index 100% rename from amiga/resources/Themes/Default/back_g.png rename to frontends/amiga/resources/Themes/Default/back_g.png diff --git a/amiga/resources/Themes/Default/back_h.png b/frontends/amiga/resources/Themes/Default/back_h.png similarity index 100% rename from amiga/resources/Themes/Default/back_h.png rename to frontends/amiga/resources/Themes/Default/back_h.png diff --git a/amiga/resources/Themes/Default/closetab.png b/frontends/amiga/resources/Themes/Default/closetab.png similarity index 100% rename from amiga/resources/Themes/Default/closetab.png rename to frontends/amiga/resources/Themes/Default/closetab.png diff --git a/amiga/resources/Themes/Default/closetab_g.png b/frontends/amiga/resources/Themes/Default/closetab_g.png similarity index 100% rename from amiga/resources/Themes/Default/closetab_g.png rename to frontends/amiga/resources/Themes/Default/closetab_g.png diff --git a/amiga/resources/Themes/Default/forward.png b/frontends/amiga/resources/Themes/Default/forward.png similarity index 100% rename from amiga/resources/Themes/Default/forward.png rename to frontends/amiga/resources/Themes/Default/forward.png diff --git a/amiga/resources/Themes/Default/forward_g.png b/frontends/amiga/resources/Themes/Default/forward_g.png similarity index 100% rename from amiga/resources/Themes/Default/forward_g.png rename to frontends/amiga/resources/Themes/Default/forward_g.png diff --git a/amiga/resources/Themes/Default/forward_h.png b/frontends/amiga/resources/Themes/Default/forward_h.png similarity index 100% rename from amiga/resources/Themes/Default/forward_h.png rename to frontends/amiga/resources/Themes/Default/forward_h.png diff --git a/amiga/resources/Themes/Default/home.png b/frontends/amiga/resources/Themes/Default/home.png similarity index 100% rename from amiga/resources/Themes/Default/home.png rename to frontends/amiga/resources/Themes/Default/home.png diff --git a/amiga/resources/Themes/Default/home_g.png b/frontends/amiga/resources/Themes/Default/home_g.png similarity index 100% rename from amiga/resources/Themes/Default/home_g.png rename to frontends/amiga/resources/Themes/Default/home_g.png diff --git a/amiga/resources/Themes/Default/home_h.png b/frontends/amiga/resources/Themes/Default/home_h.png similarity index 100% rename from amiga/resources/Themes/Default/home_h.png rename to frontends/amiga/resources/Themes/Default/home_h.png diff --git a/amiga/resources/Themes/Default/reload.png b/frontends/amiga/resources/Themes/Default/reload.png similarity index 100% rename from amiga/resources/Themes/Default/reload.png rename to frontends/amiga/resources/Themes/Default/reload.png diff --git a/amiga/resources/Themes/Default/reload_g.png b/frontends/amiga/resources/Themes/Default/reload_g.png similarity index 100% rename from amiga/resources/Themes/Default/reload_g.png rename to frontends/amiga/resources/Themes/Default/reload_g.png diff --git a/amiga/resources/Themes/Default/reload_h.png b/frontends/amiga/resources/Themes/Default/reload_h.png similarity index 100% rename from amiga/resources/Themes/Default/reload_h.png rename to frontends/amiga/resources/Themes/Default/reload_h.png diff --git a/amiga/resources/Themes/Default/search.png b/frontends/amiga/resources/Themes/Default/search.png similarity index 100% rename from amiga/resources/Themes/Default/search.png rename to frontends/amiga/resources/Themes/Default/search.png diff --git a/amiga/resources/Themes/Default/stop.png b/frontends/amiga/resources/Themes/Default/stop.png similarity index 100% rename from amiga/resources/Themes/Default/stop.png rename to frontends/amiga/resources/Themes/Default/stop.png diff --git a/amiga/resources/Themes/Default/stop_g.png b/frontends/amiga/resources/Themes/Default/stop_g.png similarity index 100% rename from amiga/resources/Themes/Default/stop_g.png rename to frontends/amiga/resources/Themes/Default/stop_g.png diff --git a/amiga/resources/Themes/Default/stop_h.png b/frontends/amiga/resources/Themes/Default/stop_h.png similarity index 100% rename from amiga/resources/Themes/Default/stop_h.png rename to frontends/amiga/resources/Themes/Default/stop_h.png diff --git a/amiga/resources/blankspace.png b/frontends/amiga/resources/blankspace.png similarity index 100% rename from amiga/resources/blankspace.png rename to frontends/amiga/resources/blankspace.png diff --git a/amiga/resources/ca-bundle b/frontends/amiga/resources/ca-bundle similarity index 100% rename from amiga/resources/ca-bundle rename to frontends/amiga/resources/ca-bundle diff --git a/amiga/resources/de b/frontends/amiga/resources/de similarity index 100% rename from amiga/resources/de rename to frontends/amiga/resources/de diff --git a/amiga/resources/default.css b/frontends/amiga/resources/default.css similarity index 100% rename from amiga/resources/default.css rename to frontends/amiga/resources/default.css diff --git a/amiga/resources/default.css.info b/frontends/amiga/resources/default.css.info similarity index 100% rename from amiga/resources/default.css.info rename to frontends/amiga/resources/default.css.info diff --git a/amiga/resources/en b/frontends/amiga/resources/en similarity index 100% rename from amiga/resources/en rename to frontends/amiga/resources/en diff --git a/amiga/resources/favicon.png b/frontends/amiga/resources/favicon.png similarity index 100% rename from amiga/resources/favicon.png rename to frontends/amiga/resources/favicon.png diff --git a/amiga/resources/fr b/frontends/amiga/resources/fr similarity index 100% rename from amiga/resources/fr rename to frontends/amiga/resources/fr diff --git a/amiga/resources/it b/frontends/amiga/resources/it similarity index 100% rename from amiga/resources/it rename to frontends/amiga/resources/it diff --git a/amiga/resources/mimetypes b/frontends/amiga/resources/mimetypes similarity index 100% rename from amiga/resources/mimetypes rename to frontends/amiga/resources/mimetypes diff --git a/amiga/resources/nl b/frontends/amiga/resources/nl similarity index 100% rename from amiga/resources/nl rename to frontends/amiga/resources/nl diff --git a/amiga/resources/nsdefault.css b/frontends/amiga/resources/nsdefault.css similarity index 100% rename from amiga/resources/nsdefault.css rename to frontends/amiga/resources/nsdefault.css diff --git a/amiga/resources/quirks.css b/frontends/amiga/resources/quirks.css similarity index 100% rename from amiga/resources/quirks.css rename to frontends/amiga/resources/quirks.css diff --git a/amiga/resources/splash.png b/frontends/amiga/resources/splash.png similarity index 100% rename from amiga/resources/splash.png rename to frontends/amiga/resources/splash.png diff --git a/amiga/rtg.c b/frontends/amiga/rtg.c similarity index 100% rename from amiga/rtg.c rename to frontends/amiga/rtg.c diff --git a/amiga/rtg.h b/frontends/amiga/rtg.h similarity index 100% rename from amiga/rtg.h rename to frontends/amiga/rtg.h diff --git a/amiga/save_pdf.c b/frontends/amiga/save_pdf.c similarity index 100% rename from amiga/save_pdf.c rename to frontends/amiga/save_pdf.c diff --git a/amiga/save_pdf.h b/frontends/amiga/save_pdf.h similarity index 100% rename from amiga/save_pdf.h rename to frontends/amiga/save_pdf.h diff --git a/amiga/schedule.c b/frontends/amiga/schedule.c similarity index 100% rename from amiga/schedule.c rename to frontends/amiga/schedule.c diff --git a/amiga/schedule.h b/frontends/amiga/schedule.h similarity index 100% rename from amiga/schedule.h rename to frontends/amiga/schedule.h diff --git a/amiga/search.c b/frontends/amiga/search.c similarity index 100% rename from amiga/search.c rename to frontends/amiga/search.c diff --git a/amiga/search.h b/frontends/amiga/search.h similarity index 100% rename from amiga/search.h rename to frontends/amiga/search.h diff --git a/amiga/selectmenu.c b/frontends/amiga/selectmenu.c similarity index 100% rename from amiga/selectmenu.c rename to frontends/amiga/selectmenu.c diff --git a/amiga/selectmenu.h b/frontends/amiga/selectmenu.h similarity index 100% rename from amiga/selectmenu.h rename to frontends/amiga/selectmenu.h diff --git a/amiga/sslcert.c b/frontends/amiga/sslcert.c similarity index 100% rename from amiga/sslcert.c rename to frontends/amiga/sslcert.c diff --git a/amiga/sslcert.h b/frontends/amiga/sslcert.h similarity index 100% rename from amiga/sslcert.h rename to frontends/amiga/sslcert.h diff --git a/amiga/stringview/stringview.c b/frontends/amiga/stringview/stringview.c similarity index 100% rename from amiga/stringview/stringview.c rename to frontends/amiga/stringview/stringview.c diff --git a/amiga/stringview/stringview.h b/frontends/amiga/stringview/stringview.h similarity index 100% rename from amiga/stringview/stringview.h rename to frontends/amiga/stringview/stringview.h diff --git a/amiga/stringview/urlhistory.c b/frontends/amiga/stringview/urlhistory.c similarity index 100% rename from amiga/stringview/urlhistory.c rename to frontends/amiga/stringview/urlhistory.c diff --git a/amiga/stringview/urlhistory.h b/frontends/amiga/stringview/urlhistory.h similarity index 100% rename from amiga/stringview/urlhistory.h rename to frontends/amiga/stringview/urlhistory.h diff --git a/amiga/theme.c b/frontends/amiga/theme.c similarity index 100% rename from amiga/theme.c rename to frontends/amiga/theme.c diff --git a/amiga/theme.h b/frontends/amiga/theme.h similarity index 100% rename from amiga/theme.h rename to frontends/amiga/theme.h diff --git a/amiga/tree.c b/frontends/amiga/tree.c similarity index 100% rename from amiga/tree.c rename to frontends/amiga/tree.c diff --git a/amiga/tree.h b/frontends/amiga/tree.h similarity index 100% rename from amiga/tree.h rename to frontends/amiga/tree.h diff --git a/amiga/utf8.c b/frontends/amiga/utf8.c similarity index 100% rename from amiga/utf8.c rename to frontends/amiga/utf8.c diff --git a/amiga/utf8.h b/frontends/amiga/utf8.h similarity index 100% rename from amiga/utf8.h rename to frontends/amiga/utf8.h diff --git a/amiga/version.c b/frontends/amiga/version.c similarity index 100% rename from amiga/version.c rename to frontends/amiga/version.c diff --git a/atari/Makefile.target b/frontends/atari/Makefile similarity index 86% rename from atari/Makefile.target rename to frontends/atari/Makefile index 34be8a915..60b7f879c 100644 --- a/atari/Makefile.target +++ b/frontends/atari/Makefile @@ -34,30 +34,14 @@ endif # non-pkgconfig components FREETYPE_FONT_CFLAGS := $(shell $(FT2CF) --cflags) -DWITH_FREETYPE_FONT_DRIVER -SPIDERMONKEY_CFLAGS := -DWITH_MOZJS -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE +SPIDERMONKEY_CFLAGS := -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE -$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng))) -$(eval $(call feature_enabled,MOZJS,$(SPIDERMONKEY_CFLAGS),-ljs,JavaScript (Spidermonkey))) $(eval $(call feature_enabled,ATARI_FREETYPE_FONT,$(FREETYPE_FONT_CFLAGS),-lfreetype,(Freetype))) $(eval $(call feature_enabled,ATARI_NETSURF_FONT,-DWITH_INTERNAL_FONT_DRIVER,,(Internal Font))) $(eval $(call feature_enabled,ATARI_VDI_FONT,-DWITH_VDI_FONT_DRIVER,,(VDI Font))) $(eval $(call feature_enabled,ATARI_8BPP_SUPPORT,-DWITH_8BPP_SUPPORT,,(Indexed screen format support))) -# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here -NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG -NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 -NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 - -ifeq ($(NETSURF_USE_MOZJS),YES) -NETSURF_USE_JS:=YES -NETSURF_USE_MOZJS:=YES -endif - -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) +$(eval $(call pkg_config_find_and_add,libcares,Cares)) CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \ -D_BSD_SOURCE \ @@ -68,12 +52,12 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall -Dnsatari \ LDFLAGS += -lcflib -lcurl LDFLAGS += -lssl -lcrypto -LDFLAGS += -lz -lcares -lHermes -lgem -lm +LDFLAGS += -lz -lHermes -lgem -lm LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib -# S_ATARI are sources purely for the Atari FreeMiNT build -S_ATARI := \ +# sources purely for the Atari FreeMiNT build +S_FRONTEND := \ about.c \ bitmap.c \ clipboard.c \ @@ -115,12 +99,10 @@ S_ATARI := \ gemtk/objc.c -S_ATARI := $(addprefix atari/,$(S_ATARI)) - # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_ATARI) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) # ---------------------------------------------------------------------------- @@ -128,8 +110,8 @@ EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) # ---------------------------------------------------------------------------- ATARI_TARGET_DIR := netsurf/ -ATARI_RES_DIR := atari/res/ -ATARI_DOC_DIR := atari/doc/ +ATARI_RES_DIR := $(FRONTEND_RESOURCES_DIR)/ +ATARI_DOC_DIR := $(FRONTEND_SOURCE_DIR)/doc/ ATARI_FONT_NAME := ttf-bitstream-vera-1.10 ATARI_FONT_SOURCE_URL := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/$(ATARI_FONT_NAME).tar.gz #ATARI_FONT_SOURCE_URL := http://localhost/$(ATARI_FONT_NAME).tar.gz diff --git a/atari/Makefile.defaults b/frontends/atari/Makefile.defaults similarity index 100% rename from atari/Makefile.defaults rename to frontends/atari/Makefile.defaults diff --git a/atari/about.c b/frontends/atari/about.c similarity index 100% rename from atari/about.c rename to frontends/atari/about.c diff --git a/atari/about.h b/frontends/atari/about.h similarity index 100% rename from atari/about.h rename to frontends/atari/about.h diff --git a/atari/bitmap.c b/frontends/atari/bitmap.c similarity index 100% rename from atari/bitmap.c rename to frontends/atari/bitmap.c diff --git a/atari/bitmap.h b/frontends/atari/bitmap.h similarity index 100% rename from atari/bitmap.h rename to frontends/atari/bitmap.h diff --git a/atari/certview.c b/frontends/atari/certview.c similarity index 100% rename from atari/certview.c rename to frontends/atari/certview.c diff --git a/atari/certview.h b/frontends/atari/certview.h similarity index 100% rename from atari/certview.h rename to frontends/atari/certview.h diff --git a/atari/clipboard.c b/frontends/atari/clipboard.c similarity index 100% rename from atari/clipboard.c rename to frontends/atari/clipboard.c diff --git a/atari/clipboard.h b/frontends/atari/clipboard.h similarity index 100% rename from atari/clipboard.h rename to frontends/atari/clipboard.h diff --git a/atari/cookies.c b/frontends/atari/cookies.c similarity index 100% rename from atari/cookies.c rename to frontends/atari/cookies.c diff --git a/atari/cookies.h b/frontends/atari/cookies.h similarity index 100% rename from atari/cookies.h rename to frontends/atari/cookies.h diff --git a/atari/ctxmenu.c b/frontends/atari/ctxmenu.c similarity index 100% rename from atari/ctxmenu.c rename to frontends/atari/ctxmenu.c diff --git a/atari/ctxmenu.h b/frontends/atari/ctxmenu.h similarity index 100% rename from atari/ctxmenu.h rename to frontends/atari/ctxmenu.h diff --git a/atari/deskmenu.c b/frontends/atari/deskmenu.c similarity index 100% rename from atari/deskmenu.c rename to frontends/atari/deskmenu.c diff --git a/atari/deskmenu.h b/frontends/atari/deskmenu.h similarity index 100% rename from atari/deskmenu.h rename to frontends/atari/deskmenu.h diff --git a/atari/doc/DejaVu.txt b/frontends/atari/doc/DejaVu.txt similarity index 100% rename from atari/doc/DejaVu.txt rename to frontends/atari/doc/DejaVu.txt diff --git a/atari/doc/bugs b/frontends/atari/doc/bugs similarity index 100% rename from atari/doc/bugs rename to frontends/atari/doc/bugs diff --git a/atari/doc/changes.txt b/frontends/atari/doc/changes.txt similarity index 100% rename from atari/doc/changes.txt rename to frontends/atari/doc/changes.txt diff --git a/atari/doc/faq.txt b/frontends/atari/doc/faq.txt similarity index 100% rename from atari/doc/faq.txt rename to frontends/atari/doc/faq.txt diff --git a/atari/doc/readme.txt b/frontends/atari/doc/readme.txt similarity index 100% rename from atari/doc/readme.txt rename to frontends/atari/doc/readme.txt diff --git a/atari/doc/todo.txt b/frontends/atari/doc/todo.txt similarity index 100% rename from atari/doc/todo.txt rename to frontends/atari/doc/todo.txt diff --git a/atari/download.c b/frontends/atari/download.c similarity index 100% rename from atari/download.c rename to frontends/atari/download.c diff --git a/atari/download.h b/frontends/atari/download.h similarity index 100% rename from atari/download.h rename to frontends/atari/download.h diff --git a/atari/encoding.c b/frontends/atari/encoding.c similarity index 100% rename from atari/encoding.c rename to frontends/atari/encoding.c diff --git a/atari/encoding.h b/frontends/atari/encoding.h similarity index 100% rename from atari/encoding.h rename to frontends/atari/encoding.h diff --git a/atari/extract.php b/frontends/atari/extract.php similarity index 100% rename from atari/extract.php rename to frontends/atari/extract.php diff --git a/atari/file.c b/frontends/atari/file.c similarity index 100% rename from atari/file.c rename to frontends/atari/file.c diff --git a/atari/file.h b/frontends/atari/file.h similarity index 100% rename from atari/file.h rename to frontends/atari/file.h diff --git a/atari/filetype.c b/frontends/atari/filetype.c similarity index 100% rename from atari/filetype.c rename to frontends/atari/filetype.c diff --git a/atari/filetype.h b/frontends/atari/filetype.h similarity index 100% rename from atari/filetype.h rename to frontends/atari/filetype.h diff --git a/atari/findfile.c b/frontends/atari/findfile.c similarity index 100% rename from atari/findfile.c rename to frontends/atari/findfile.c diff --git a/atari/findfile.h b/frontends/atari/findfile.h similarity index 100% rename from atari/findfile.h rename to frontends/atari/findfile.h diff --git a/atari/font.c b/frontends/atari/font.c similarity index 100% rename from atari/font.c rename to frontends/atari/font.c diff --git a/atari/font.h b/frontends/atari/font.h similarity index 100% rename from atari/font.h rename to frontends/atari/font.h diff --git a/atari/gemtk/aestabs.c b/frontends/atari/gemtk/aestabs.c similarity index 100% rename from atari/gemtk/aestabs.c rename to frontends/atari/gemtk/aestabs.c diff --git a/atari/gemtk/aestabs.h b/frontends/atari/gemtk/aestabs.h similarity index 100% rename from atari/gemtk/aestabs.h rename to frontends/atari/gemtk/aestabs.h diff --git a/atari/gemtk/dragdrop.c b/frontends/atari/gemtk/dragdrop.c similarity index 100% rename from atari/gemtk/dragdrop.c rename to frontends/atari/gemtk/dragdrop.c diff --git a/atari/gemtk/dragdrop.h b/frontends/atari/gemtk/dragdrop.h similarity index 100% rename from atari/gemtk/dragdrop.h rename to frontends/atari/gemtk/dragdrop.h diff --git a/atari/gemtk/gemtk.h b/frontends/atari/gemtk/gemtk.h similarity index 100% rename from atari/gemtk/gemtk.h rename to frontends/atari/gemtk/gemtk.h diff --git a/atari/gemtk/guiwin.c b/frontends/atari/gemtk/guiwin.c similarity index 100% rename from atari/gemtk/guiwin.c rename to frontends/atari/gemtk/guiwin.c diff --git a/atari/gemtk/guiwin.h b/frontends/atari/gemtk/guiwin.h similarity index 100% rename from atari/gemtk/guiwin.h rename to frontends/atari/gemtk/guiwin.h diff --git a/atari/gemtk/msgbox.c b/frontends/atari/gemtk/msgbox.c similarity index 100% rename from atari/gemtk/msgbox.c rename to frontends/atari/gemtk/msgbox.c diff --git a/atari/gemtk/msgbox.h b/frontends/atari/gemtk/msgbox.h similarity index 100% rename from atari/gemtk/msgbox.h rename to frontends/atari/gemtk/msgbox.h diff --git a/atari/gemtk/objc.c b/frontends/atari/gemtk/objc.c similarity index 100% rename from atari/gemtk/objc.c rename to frontends/atari/gemtk/objc.c diff --git a/atari/gemtk/objc.h b/frontends/atari/gemtk/objc.h similarity index 100% rename from atari/gemtk/objc.h rename to frontends/atari/gemtk/objc.h diff --git a/atari/gemtk/redrawslots.c b/frontends/atari/gemtk/redrawslots.c similarity index 100% rename from atari/gemtk/redrawslots.c rename to frontends/atari/gemtk/redrawslots.c diff --git a/atari/gemtk/redrawslots.h b/frontends/atari/gemtk/redrawslots.h similarity index 100% rename from atari/gemtk/redrawslots.h rename to frontends/atari/gemtk/redrawslots.h diff --git a/atari/gemtk/utils.c b/frontends/atari/gemtk/utils.c similarity index 100% rename from atari/gemtk/utils.c rename to frontends/atari/gemtk/utils.c diff --git a/atari/gemtk/utils.h b/frontends/atari/gemtk/utils.h similarity index 100% rename from atari/gemtk/utils.h rename to frontends/atari/gemtk/utils.h diff --git a/atari/gemtk/vaproto.c b/frontends/atari/gemtk/vaproto.c similarity index 100% rename from atari/gemtk/vaproto.c rename to frontends/atari/gemtk/vaproto.c diff --git a/atari/gemtk/vaproto.h b/frontends/atari/gemtk/vaproto.h similarity index 100% rename from atari/gemtk/vaproto.h rename to frontends/atari/gemtk/vaproto.h diff --git a/atari/gui.c b/frontends/atari/gui.c similarity index 100% rename from atari/gui.c rename to frontends/atari/gui.c diff --git a/atari/gui.h b/frontends/atari/gui.h similarity index 100% rename from atari/gui.h rename to frontends/atari/gui.h diff --git a/atari/history.c b/frontends/atari/history.c similarity index 100% rename from atari/history.c rename to frontends/atari/history.c diff --git a/atari/history.h b/frontends/atari/history.h similarity index 100% rename from atari/history.h rename to frontends/atari/history.h diff --git a/atari/hotlist.c b/frontends/atari/hotlist.c similarity index 100% rename from atari/hotlist.c rename to frontends/atari/hotlist.c diff --git a/atari/hotlist.h b/frontends/atari/hotlist.h similarity index 100% rename from atari/hotlist.h rename to frontends/atari/hotlist.h diff --git a/atari/login.c b/frontends/atari/login.c similarity index 100% rename from atari/login.c rename to frontends/atari/login.c diff --git a/atari/login.h b/frontends/atari/login.h similarity index 100% rename from atari/login.h rename to frontends/atari/login.h diff --git a/atari/misc.c b/frontends/atari/misc.c similarity index 100% rename from atari/misc.c rename to frontends/atari/misc.c diff --git a/atari/misc.h b/frontends/atari/misc.h similarity index 100% rename from atari/misc.h rename to frontends/atari/misc.h diff --git a/atari/options.h b/frontends/atari/options.h similarity index 100% rename from atari/options.h rename to frontends/atari/options.h diff --git a/atari/osspec.c b/frontends/atari/osspec.c similarity index 100% rename from atari/osspec.c rename to frontends/atari/osspec.c diff --git a/atari/osspec.h b/frontends/atari/osspec.h similarity index 100% rename from atari/osspec.h rename to frontends/atari/osspec.h diff --git a/atari/plot/eddi.h b/frontends/atari/plot/eddi.h similarity index 100% rename from atari/plot/eddi.h rename to frontends/atari/plot/eddi.h diff --git a/atari/plot/eddi.s b/frontends/atari/plot/eddi.s similarity index 100% rename from atari/plot/eddi.s rename to frontends/atari/plot/eddi.s diff --git a/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c similarity index 100% rename from atari/plot/font_freetype.c rename to frontends/atari/plot/font_freetype.c diff --git a/atari/plot/font_freetype.h b/frontends/atari/plot/font_freetype.h similarity index 100% rename from atari/plot/font_freetype.h rename to frontends/atari/plot/font_freetype.h diff --git a/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c similarity index 100% rename from atari/plot/font_internal.c rename to frontends/atari/plot/font_internal.c diff --git a/atari/plot/font_internal.h b/frontends/atari/plot/font_internal.h similarity index 100% rename from atari/plot/font_internal.h rename to frontends/atari/plot/font_internal.h diff --git a/atari/plot/font_vdi.c b/frontends/atari/plot/font_vdi.c similarity index 100% rename from atari/plot/font_vdi.c rename to frontends/atari/plot/font_vdi.c diff --git a/atari/plot/font_vdi.h b/frontends/atari/plot/font_vdi.h similarity index 100% rename from atari/plot/font_vdi.h rename to frontends/atari/plot/font_vdi.h diff --git a/atari/plot/fontplot.c b/frontends/atari/plot/fontplot.c similarity index 100% rename from atari/plot/fontplot.c rename to frontends/atari/plot/fontplot.c diff --git a/atari/plot/fontplot.h b/frontends/atari/plot/fontplot.h similarity index 100% rename from atari/plot/fontplot.h rename to frontends/atari/plot/fontplot.h diff --git a/atari/plot/plot.c b/frontends/atari/plot/plot.c similarity index 100% rename from atari/plot/plot.c rename to frontends/atari/plot/plot.c diff --git a/atari/plot/plot.h b/frontends/atari/plot/plot.h similarity index 100% rename from atari/plot/plot.h rename to frontends/atari/plot/plot.h diff --git a/atari/redrawslots.c b/frontends/atari/redrawslots.c similarity index 100% rename from atari/redrawslots.c rename to frontends/atari/redrawslots.c diff --git a/atari/redrawslots.h b/frontends/atari/redrawslots.h similarity index 100% rename from atari/redrawslots.h rename to frontends/atari/redrawslots.h diff --git a/atari/res/blank b/frontends/atari/res/blank similarity index 100% rename from atari/res/blank rename to frontends/atari/res/blank diff --git a/atari/res/favicon.ico b/frontends/atari/res/favicon.ico similarity index 100% rename from atari/res/favicon.ico rename to frontends/atari/res/favicon.ico diff --git a/atari/res/icons/toolbar/atfact/main.png b/frontends/atari/res/icons/toolbar/atfact/main.png similarity index 100% rename from atari/res/icons/toolbar/atfact/main.png rename to frontends/atari/res/icons/toolbar/atfact/main.png diff --git a/atari/res/icons/toolbar/atfact/throbber.png b/frontends/atari/res/icons/toolbar/atfact/throbber.png similarity index 100% rename from atari/res/icons/toolbar/atfact/throbber.png rename to frontends/atari/res/icons/toolbar/atfact/throbber.png diff --git a/atari/res/icons/toolbar/default/main.png b/frontends/atari/res/icons/toolbar/default/main.png similarity index 100% rename from atari/res/icons/toolbar/default/main.png rename to frontends/atari/res/icons/toolbar/default/main.png diff --git a/atari/res/icons/toolbar/default/main.xcf b/frontends/atari/res/icons/toolbar/default/main.xcf similarity index 100% rename from atari/res/icons/toolbar/default/main.xcf rename to frontends/atari/res/icons/toolbar/default/main.xcf diff --git a/atari/res/icons/toolbar/default/throbber.png b/frontends/atari/res/icons/toolbar/default/throbber.png similarity index 100% rename from atari/res/icons/toolbar/default/throbber.png rename to frontends/atari/res/icons/toolbar/default/throbber.png diff --git a/atari/res/icons/toolbar/default/throbber.xcf b/frontends/atari/res/icons/toolbar/default/throbber.xcf similarity index 100% rename from atari/res/icons/toolbar/default/throbber.xcf rename to frontends/atari/res/icons/toolbar/default/throbber.xcf diff --git a/atari/res/languages b/frontends/atari/res/languages similarity index 100% rename from atari/res/languages rename to frontends/atari/res/languages diff --git a/atari/res/netsurf.rsc b/frontends/atari/res/netsurf.rsc similarity index 100% rename from atari/res/netsurf.rsc rename to frontends/atari/res/netsurf.rsc diff --git a/atari/res/netsurf.rsh b/frontends/atari/res/netsurf.rsh similarity index 100% rename from atari/res/netsurf.rsh rename to frontends/atari/res/netsurf.rsh diff --git a/atari/res/netsurf.rsm b/frontends/atari/res/netsurf.rsm similarity index 100% rename from atari/res/netsurf.rsm rename to frontends/atari/res/netsurf.rsm diff --git a/atari/rootwin.c b/frontends/atari/rootwin.c similarity index 100% rename from atari/rootwin.c rename to frontends/atari/rootwin.c diff --git a/atari/rootwin.h b/frontends/atari/rootwin.h similarity index 100% rename from atari/rootwin.h rename to frontends/atari/rootwin.h diff --git a/atari/save.h b/frontends/atari/save.h similarity index 100% rename from atari/save.h rename to frontends/atari/save.h diff --git a/atari/schedule.c b/frontends/atari/schedule.c similarity index 100% rename from atari/schedule.c rename to frontends/atari/schedule.c diff --git a/atari/schedule.h b/frontends/atari/schedule.h similarity index 100% rename from atari/schedule.h rename to frontends/atari/schedule.h diff --git a/atari/scripts/env-v4e.sh b/frontends/atari/scripts/env-v4e.sh similarity index 100% rename from atari/scripts/env-v4e.sh rename to frontends/atari/scripts/env-v4e.sh diff --git a/atari/scripts/env-x86.sh b/frontends/atari/scripts/env-x86.sh similarity index 100% rename from atari/scripts/env-x86.sh rename to frontends/atari/scripts/env-x86.sh diff --git a/atari/search.c b/frontends/atari/search.c similarity index 100% rename from atari/search.c rename to frontends/atari/search.c diff --git a/atari/search.h b/frontends/atari/search.h similarity index 100% rename from atari/search.h rename to frontends/atari/search.h diff --git a/atari/settings.c b/frontends/atari/settings.c similarity index 100% rename from atari/settings.c rename to frontends/atari/settings.c diff --git a/atari/settings.h b/frontends/atari/settings.h similarity index 100% rename from atari/settings.h rename to frontends/atari/settings.h diff --git a/atari/statusbar.c b/frontends/atari/statusbar.c similarity index 100% rename from atari/statusbar.c rename to frontends/atari/statusbar.c diff --git a/atari/statusbar.h b/frontends/atari/statusbar.h similarity index 100% rename from atari/statusbar.h rename to frontends/atari/statusbar.h diff --git a/atari/toolbar.c b/frontends/atari/toolbar.c similarity index 100% rename from atari/toolbar.c rename to frontends/atari/toolbar.c diff --git a/atari/toolbar.h b/frontends/atari/toolbar.h similarity index 100% rename from atari/toolbar.h rename to frontends/atari/toolbar.h diff --git a/atari/treeview.c b/frontends/atari/treeview.c similarity index 100% rename from atari/treeview.c rename to frontends/atari/treeview.c diff --git a/atari/treeview.h b/frontends/atari/treeview.h similarity index 100% rename from atari/treeview.h rename to frontends/atari/treeview.h diff --git a/atari/verify_ssl.c b/frontends/atari/verify_ssl.c similarity index 100% rename from atari/verify_ssl.c rename to frontends/atari/verify_ssl.c diff --git a/atari/verify_ssl.h b/frontends/atari/verify_ssl.h similarity index 100% rename from atari/verify_ssl.h rename to frontends/atari/verify_ssl.h diff --git a/frontends/beos/Makefile b/frontends/beos/Makefile new file mode 100644 index 000000000..8a79fc5ec --- /dev/null +++ b/frontends/beos/Makefile @@ -0,0 +1,102 @@ +# ---------------------------------------------------------------------------- +# BeOS target setup +# ---------------------------------------------------------------------------- + +# Linker flags +LDFLAGS += -L/boot/home/config/lib +LDFLAGS += -L/boot/common/lib +LDFLAGS += -lbe -ltranslation -ltracker -lcolumnlistview -lnetwork +ifeq ($(CC_MAJOR),2) + LDFLAGS += -lstdc++.r4 +else + LDFLAGS += -lstdc++ -lsupc++ +endif + +COMMON_WARNFLAGS += -Wno-multichar + +# compiler flags +CFLAGS += -std=c99 -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g +CXXFLAGS += -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE -Drestrict="" -g + +BEOS_BERES := beres +BEOS_RC := rc +BEOS_XRES := xres +BEOS_SETVER := setversion +BEOS_MIMESET := mimeset + +VERSION_FULL := $(shell sed -n '/_version.*=.*"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) +VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) +VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) + +# ---------------------------------------------------------------------------- +# Source file setup +# ---------------------------------------------------------------------------- + +# sources purely for the BeOS build +S_FRONTEND := about.cpp bitmap.cpp cookies.cpp download.cpp \ + fetch_rsrc.cpp filetype.cpp font.cpp gui.cpp login.cpp \ + gui_options.cpp plotters.cpp scaffolding.cpp search.cpp \ + schedule.cpp throbber.cpp window.cpp + +# This is the final source build list +# Note this is deliberately *not* expanded here as common and image +# are not yet available +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) +EXETARGET := NetSurf + +# The filter and target for split messages +MESSAGES_FILTER=beos +MESSAGES_TARGET=$(FRONTEND_RESOURCES_DIR) + +# ---------------------------------------------------------------------------- +# Resources +# ---------------------------------------------------------------------------- + +RDEF_BEOS := res.rdef +RDEF_BEOS := $(addprefix $(FRONTEND_SOURCE_DIR)/,$(RDEF_BEOS)) + +RDEF_IMP_BEOS := res_import.rdef +RDEF_IMP_BEOS := $(addprefix $(OBJROOT)/,$(subst /,_,$(RDEF_IMP_BEOS))) + +RDEP_BEOS := \ + adblock.css beosdefault.css default.css internal.css quirks.css \ + netsurf.png favicon.png ca-bundle.txt \ + credits.html licence.html welcome.html maps.html SearchEngines + +RDEP_BEOS := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(RDEP_BEOS)) \ + $(wildcard $(FRONTEND_RESOURCES_DIR)/icons/*.png) \ + $(wildcard $(FRONTEND_RESOURCES_DIR)/??/*) \ + $(wildcard $(FRONTEND_RESOURCES_DIR)/throbber/throbber*.png) + +RSRC_BEOS = $(addprefix $(OBJROOT)/,$(subst /,_,$(patsubst %.rdef,%.rsrc,$(RDEF_BEOS)))) +RESOURCES = $(RSRC_BEOS) + +$(RDEF_IMP_BEOS): $(RDEP_BEOS) + $(VQ)echo " GEN: $@" + $(Q)n=5000; for f in $^; do echo "resource($$n,\"$${f#beos/res/}\") #'data' import \"$${f#beos/}\";"; n=$$(($$n+1)); done > $@ + +$(RSRC_BEOS): $(RDEF_BEOS) $(RDEF_IMP_BEOS) + $(VQ)echo " RC: $<" + $(Q)$(BEOS_RC) -I beos -o $@ $^ + + +# ---------------------------------------------------------------------------- +# Install target +# ---------------------------------------------------------------------------- + +install-beos: + mkdir -p $(DESTDIR)$(NETSURF_BEOS_BIN) + mkdir -p $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + @copyattr -d $(EXETARGET) $(DESTDIR)$(NETSURF_BEOS_BIN)NetSurf + @cp -vRL $(FRONTEND_RESOURCES_DIR)/adblock.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + @cp -vRL $(FRONTEND_RESOURCES_DIR)/ca-bundle.txt $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + @cp -vRL $(FRONTEND_RESOURCES_DIR)/default.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + @cp -vRL $(FRONTEND_RESOURCES_DIR)/beosdefault.css $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + @cp -vRL $(FRONTEND_RESOURCES_DIR)/license $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + @cp -vRL $(FRONTEND_RESOURCES_DIR)/SearchEngines $(DESTDIR)$(NETSURF_BEOS_RESOURCES) + +# ---------------------------------------------------------------------------- +# Package target +# ---------------------------------------------------------------------------- + +package-beos: diff --git a/beos/Makefile.defaults b/frontends/beos/Makefile.defaults similarity index 100% rename from beos/Makefile.defaults rename to frontends/beos/Makefile.defaults diff --git a/beos/WindowStack.h b/frontends/beos/WindowStack.h similarity index 100% rename from beos/WindowStack.h rename to frontends/beos/WindowStack.h diff --git a/beos/about.cpp b/frontends/beos/about.cpp similarity index 100% rename from beos/about.cpp rename to frontends/beos/about.cpp diff --git a/beos/about.h b/frontends/beos/about.h similarity index 100% rename from beos/about.h rename to frontends/beos/about.h diff --git a/beos/beos_res.rsrc b/frontends/beos/beos_res.rsrc similarity index 100% rename from beos/beos_res.rsrc rename to frontends/beos/beos_res.rsrc diff --git a/beos/bitmap.cpp b/frontends/beos/bitmap.cpp similarity index 100% rename from beos/bitmap.cpp rename to frontends/beos/bitmap.cpp diff --git a/beos/bitmap.h b/frontends/beos/bitmap.h similarity index 100% rename from beos/bitmap.h rename to frontends/beos/bitmap.h diff --git a/beos/cookies.cpp b/frontends/beos/cookies.cpp similarity index 100% rename from beos/cookies.cpp rename to frontends/beos/cookies.cpp diff --git a/beos/cookies.h b/frontends/beos/cookies.h similarity index 100% rename from beos/cookies.h rename to frontends/beos/cookies.h diff --git a/beos/download.cpp b/frontends/beos/download.cpp similarity index 100% rename from beos/download.cpp rename to frontends/beos/download.cpp diff --git a/beos/download.h b/frontends/beos/download.h similarity index 100% rename from beos/download.h rename to frontends/beos/download.h diff --git a/beos/fetch_rsrc.cpp b/frontends/beos/fetch_rsrc.cpp similarity index 100% rename from beos/fetch_rsrc.cpp rename to frontends/beos/fetch_rsrc.cpp diff --git a/beos/fetch_rsrc.h b/frontends/beos/fetch_rsrc.h similarity index 100% rename from beos/fetch_rsrc.h rename to frontends/beos/fetch_rsrc.h diff --git a/beos/filetype.cpp b/frontends/beos/filetype.cpp similarity index 100% rename from beos/filetype.cpp rename to frontends/beos/filetype.cpp diff --git a/beos/filetype.h b/frontends/beos/filetype.h similarity index 100% rename from beos/filetype.h rename to frontends/beos/filetype.h diff --git a/beos/font.cpp b/frontends/beos/font.cpp similarity index 100% rename from beos/font.cpp rename to frontends/beos/font.cpp diff --git a/beos/font.h b/frontends/beos/font.h similarity index 100% rename from beos/font.h rename to frontends/beos/font.h diff --git a/beos/gui.cpp b/frontends/beos/gui.cpp similarity index 100% rename from beos/gui.cpp rename to frontends/beos/gui.cpp diff --git a/beos/gui.h b/frontends/beos/gui.h similarity index 100% rename from beos/gui.h rename to frontends/beos/gui.h diff --git a/beos/gui_options.cpp b/frontends/beos/gui_options.cpp similarity index 100% rename from beos/gui_options.cpp rename to frontends/beos/gui_options.cpp diff --git a/beos/gui_options.h b/frontends/beos/gui_options.h similarity index 100% rename from beos/gui_options.h rename to frontends/beos/gui_options.h diff --git a/beos/login.cpp b/frontends/beos/login.cpp similarity index 100% rename from beos/login.cpp rename to frontends/beos/login.cpp diff --git a/beos/options.h b/frontends/beos/options.h similarity index 100% rename from beos/options.h rename to frontends/beos/options.h diff --git a/beos/plotters.cpp b/frontends/beos/plotters.cpp similarity index 100% rename from beos/plotters.cpp rename to frontends/beos/plotters.cpp diff --git a/beos/plotters.h b/frontends/beos/plotters.h similarity index 100% rename from beos/plotters.h rename to frontends/beos/plotters.h diff --git a/beos/res.h b/frontends/beos/res.h similarity index 100% rename from beos/res.h rename to frontends/beos/res.h diff --git a/beos/res.rdef b/frontends/beos/res.rdef similarity index 100% rename from beos/res.rdef rename to frontends/beos/res.rdef diff --git a/beos/res/SearchEngines b/frontends/beos/res/SearchEngines similarity index 100% rename from beos/res/SearchEngines rename to frontends/beos/res/SearchEngines diff --git a/beos/res/adblock.css b/frontends/beos/res/adblock.css similarity index 100% rename from beos/res/adblock.css rename to frontends/beos/res/adblock.css diff --git a/beos/res/beosdefault.css b/frontends/beos/res/beosdefault.css similarity index 100% rename from beos/res/beosdefault.css rename to frontends/beos/res/beosdefault.css diff --git a/beos/res/ca-bundle.txt b/frontends/beos/res/ca-bundle.txt similarity index 100% rename from beos/res/ca-bundle.txt rename to frontends/beos/res/ca-bundle.txt diff --git a/beos/res/credits.html b/frontends/beos/res/credits.html similarity index 100% rename from beos/res/credits.html rename to frontends/beos/res/credits.html diff --git a/beos/res/de/welcome.html b/frontends/beos/res/de/welcome.html similarity index 100% rename from beos/res/de/welcome.html rename to frontends/beos/res/de/welcome.html diff --git a/beos/res/default.css b/frontends/beos/res/default.css similarity index 100% rename from beos/res/default.css rename to frontends/beos/res/default.css diff --git a/beos/res/en/credits.html b/frontends/beos/res/en/credits.html similarity index 100% rename from beos/res/en/credits.html rename to frontends/beos/res/en/credits.html diff --git a/beos/res/en/licence.html b/frontends/beos/res/en/licence.html similarity index 100% rename from beos/res/en/licence.html rename to frontends/beos/res/en/licence.html diff --git a/beos/res/en/maps.html b/frontends/beos/res/en/maps.html similarity index 100% rename from beos/res/en/maps.html rename to frontends/beos/res/en/maps.html diff --git a/beos/res/en/welcome.html b/frontends/beos/res/en/welcome.html similarity index 100% rename from beos/res/en/welcome.html rename to frontends/beos/res/en/welcome.html diff --git a/beos/res/favicon.png b/frontends/beos/res/favicon.png similarity index 100% rename from beos/res/favicon.png rename to frontends/beos/res/favicon.png diff --git a/beos/res/icons b/frontends/beos/res/icons similarity index 100% rename from beos/res/icons rename to frontends/beos/res/icons diff --git a/beos/res/internal.css b/frontends/beos/res/internal.css similarity index 100% rename from beos/res/internal.css rename to frontends/beos/res/internal.css diff --git a/beos/res/it/credits.html b/frontends/beos/res/it/credits.html similarity index 100% rename from beos/res/it/credits.html rename to frontends/beos/res/it/credits.html diff --git a/beos/res/it/licence.html b/frontends/beos/res/it/licence.html similarity index 100% rename from beos/res/it/licence.html rename to frontends/beos/res/it/licence.html diff --git a/beos/res/it/welcome.html b/frontends/beos/res/it/welcome.html similarity index 100% rename from beos/res/it/welcome.html rename to frontends/beos/res/it/welcome.html diff --git a/beos/res/ja/welcome.html b/frontends/beos/res/ja/welcome.html similarity index 100% rename from beos/res/ja/welcome.html rename to frontends/beos/res/ja/welcome.html diff --git a/beos/res/licence.html b/frontends/beos/res/licence.html similarity index 100% rename from beos/res/licence.html rename to frontends/beos/res/licence.html diff --git a/gtk/res/license b/frontends/beos/res/license similarity index 100% rename from gtk/res/license rename to frontends/beos/res/license diff --git a/beos/res/maps.html b/frontends/beos/res/maps.html similarity index 100% rename from beos/res/maps.html rename to frontends/beos/res/maps.html diff --git a/beos/res/netsurf.png b/frontends/beos/res/netsurf.png similarity index 100% rename from beos/res/netsurf.png rename to frontends/beos/res/netsurf.png diff --git a/beos/res/quirks.css b/frontends/beos/res/quirks.css similarity index 100% rename from beos/res/quirks.css rename to frontends/beos/res/quirks.css diff --git a/beos/res/throbber/throbber0.png b/frontends/beos/res/throbber/throbber0.png similarity index 100% rename from beos/res/throbber/throbber0.png rename to frontends/beos/res/throbber/throbber0.png diff --git a/beos/res/throbber/throbber1.png b/frontends/beos/res/throbber/throbber1.png similarity index 100% rename from beos/res/throbber/throbber1.png rename to frontends/beos/res/throbber/throbber1.png diff --git a/beos/res/throbber/throbber2.png b/frontends/beos/res/throbber/throbber2.png similarity index 100% rename from beos/res/throbber/throbber2.png rename to frontends/beos/res/throbber/throbber2.png diff --git a/beos/res/throbber/throbber3.png b/frontends/beos/res/throbber/throbber3.png similarity index 100% rename from beos/res/throbber/throbber3.png rename to frontends/beos/res/throbber/throbber3.png diff --git a/beos/res/throbber/throbber4.png b/frontends/beos/res/throbber/throbber4.png similarity index 100% rename from beos/res/throbber/throbber4.png rename to frontends/beos/res/throbber/throbber4.png diff --git a/beos/res/throbber/throbber5.png b/frontends/beos/res/throbber/throbber5.png similarity index 100% rename from beos/res/throbber/throbber5.png rename to frontends/beos/res/throbber/throbber5.png diff --git a/beos/res/throbber/throbber6.png b/frontends/beos/res/throbber/throbber6.png similarity index 100% rename from beos/res/throbber/throbber6.png rename to frontends/beos/res/throbber/throbber6.png diff --git a/beos/res/throbber/throbber7.png b/frontends/beos/res/throbber/throbber7.png similarity index 100% rename from beos/res/throbber/throbber7.png rename to frontends/beos/res/throbber/throbber7.png diff --git a/beos/res/throbber/throbber8.png b/frontends/beos/res/throbber/throbber8.png similarity index 100% rename from beos/res/throbber/throbber8.png rename to frontends/beos/res/throbber/throbber8.png diff --git a/beos/res/welcome.html b/frontends/beos/res/welcome.html similarity index 100% rename from beos/res/welcome.html rename to frontends/beos/res/welcome.html diff --git a/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp similarity index 100% rename from beos/scaffolding.cpp rename to frontends/beos/scaffolding.cpp diff --git a/beos/scaffolding.h b/frontends/beos/scaffolding.h similarity index 100% rename from beos/scaffolding.h rename to frontends/beos/scaffolding.h diff --git a/beos/schedule.cpp b/frontends/beos/schedule.cpp similarity index 100% rename from beos/schedule.cpp rename to frontends/beos/schedule.cpp diff --git a/beos/schedule.h b/frontends/beos/schedule.h similarity index 100% rename from beos/schedule.h rename to frontends/beos/schedule.h diff --git a/beos/search.cpp b/frontends/beos/search.cpp similarity index 100% rename from beos/search.cpp rename to frontends/beos/search.cpp diff --git a/beos/throbber.cpp b/frontends/beos/throbber.cpp similarity index 100% rename from beos/throbber.cpp rename to frontends/beos/throbber.cpp diff --git a/beos/throbber.h b/frontends/beos/throbber.h similarity index 100% rename from beos/throbber.h rename to frontends/beos/throbber.h diff --git a/beos/window.cpp b/frontends/beos/window.cpp similarity index 100% rename from beos/window.cpp rename to frontends/beos/window.cpp diff --git a/beos/window.h b/frontends/beos/window.h similarity index 100% rename from beos/window.h rename to frontends/beos/window.h diff --git a/cocoa/ArrowBox.h b/frontends/cocoa/ArrowBox.h similarity index 100% rename from cocoa/ArrowBox.h rename to frontends/cocoa/ArrowBox.h diff --git a/cocoa/ArrowBox.m b/frontends/cocoa/ArrowBox.m similarity index 100% rename from cocoa/ArrowBox.m rename to frontends/cocoa/ArrowBox.m diff --git a/cocoa/ArrowWindow.h b/frontends/cocoa/ArrowWindow.h similarity index 100% rename from cocoa/ArrowWindow.h rename to frontends/cocoa/ArrowWindow.h diff --git a/cocoa/ArrowWindow.m b/frontends/cocoa/ArrowWindow.m similarity index 100% rename from cocoa/ArrowWindow.m rename to frontends/cocoa/ArrowWindow.m diff --git a/cocoa/BlackScroller.h b/frontends/cocoa/BlackScroller.h similarity index 100% rename from cocoa/BlackScroller.h rename to frontends/cocoa/BlackScroller.h diff --git a/cocoa/BlackScroller.m b/frontends/cocoa/BlackScroller.m similarity index 100% rename from cocoa/BlackScroller.m rename to frontends/cocoa/BlackScroller.m diff --git a/cocoa/BookmarksController.h b/frontends/cocoa/BookmarksController.h similarity index 100% rename from cocoa/BookmarksController.h rename to frontends/cocoa/BookmarksController.h diff --git a/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m similarity index 100% rename from cocoa/BookmarksController.m rename to frontends/cocoa/BookmarksController.m diff --git a/cocoa/BrowserView.h b/frontends/cocoa/BrowserView.h similarity index 100% rename from cocoa/BrowserView.h rename to frontends/cocoa/BrowserView.h diff --git a/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m similarity index 100% rename from cocoa/BrowserView.m rename to frontends/cocoa/BrowserView.m diff --git a/cocoa/BrowserViewController.h b/frontends/cocoa/BrowserViewController.h similarity index 100% rename from cocoa/BrowserViewController.h rename to frontends/cocoa/BrowserViewController.h diff --git a/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m similarity index 100% rename from cocoa/BrowserViewController.m rename to frontends/cocoa/BrowserViewController.m diff --git a/cocoa/BrowserWindow.h b/frontends/cocoa/BrowserWindow.h similarity index 100% rename from cocoa/BrowserWindow.h rename to frontends/cocoa/BrowserWindow.h diff --git a/cocoa/BrowserWindow.m b/frontends/cocoa/BrowserWindow.m similarity index 100% rename from cocoa/BrowserWindow.m rename to frontends/cocoa/BrowserWindow.m diff --git a/cocoa/BrowserWindowController.h b/frontends/cocoa/BrowserWindowController.h similarity index 100% rename from cocoa/BrowserWindowController.h rename to frontends/cocoa/BrowserWindowController.h diff --git a/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m similarity index 100% rename from cocoa/BrowserWindowController.m rename to frontends/cocoa/BrowserWindowController.m diff --git a/cocoa/DownloadWindowController.h b/frontends/cocoa/DownloadWindowController.h similarity index 100% rename from cocoa/DownloadWindowController.h rename to frontends/cocoa/DownloadWindowController.h diff --git a/cocoa/DownloadWindowController.m b/frontends/cocoa/DownloadWindowController.m similarity index 100% rename from cocoa/DownloadWindowController.m rename to frontends/cocoa/DownloadWindowController.m diff --git a/cocoa/FormSelectMenu.h b/frontends/cocoa/FormSelectMenu.h similarity index 100% rename from cocoa/FormSelectMenu.h rename to frontends/cocoa/FormSelectMenu.h diff --git a/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m similarity index 100% rename from cocoa/FormSelectMenu.m rename to frontends/cocoa/FormSelectMenu.m diff --git a/cocoa/HistoryView.h b/frontends/cocoa/HistoryView.h similarity index 100% rename from cocoa/HistoryView.h rename to frontends/cocoa/HistoryView.h diff --git a/cocoa/HistoryView.m b/frontends/cocoa/HistoryView.m similarity index 100% rename from cocoa/HistoryView.m rename to frontends/cocoa/HistoryView.m diff --git a/cocoa/HistoryWindowController.h b/frontends/cocoa/HistoryWindowController.h similarity index 100% rename from cocoa/HistoryWindowController.h rename to frontends/cocoa/HistoryWindowController.h diff --git a/cocoa/HistoryWindowController.m b/frontends/cocoa/HistoryWindowController.m similarity index 100% rename from cocoa/HistoryWindowController.m rename to frontends/cocoa/HistoryWindowController.m diff --git a/cocoa/LocalHistoryController.h b/frontends/cocoa/LocalHistoryController.h similarity index 100% rename from cocoa/LocalHistoryController.h rename to frontends/cocoa/LocalHistoryController.h diff --git a/cocoa/LocalHistoryController.m b/frontends/cocoa/LocalHistoryController.m similarity index 100% rename from cocoa/LocalHistoryController.m rename to frontends/cocoa/LocalHistoryController.m diff --git a/cocoa/Makefile.target b/frontends/cocoa/Makefile similarity index 66% rename from cocoa/Makefile.target rename to frontends/cocoa/Makefile index 615c007ca..9f345c0b9 100644 --- a/cocoa/Makefile.target +++ b/frontends/cocoa/Makefile @@ -46,15 +46,6 @@ VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/ver LDFLAGS += -Wl,-framework,Cocoa -Wl,-framework,Carbon $(NETLDFLAGS) -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG -NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG - -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) -$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) $(eval $(call feature_enabled,IMAGEIO,-DWITH_APPLE_IMAGE,,Apple ImageIO )) ifneq ($(UNIVERSAL),) @@ -68,36 +59,36 @@ endif # Source file setup # ---------------------------------------------------------------------------- -# S_COCOA are sources purely for the Mac OS X build -S_COCOA := \ - BookmarksController.m \ - BrowserView.m \ - BrowserViewController.m \ - BrowserWindowController.m \ - BrowserWindow.m \ - DownloadWindowController.m \ - NetSurfAppDelegate.m \ - NetsurfApp.m \ - PreferencesWindowController.m \ - ScrollableView.m \ - SearchWindowController.m \ - URLFieldCell.m \ - Tree.m \ - TreeView.m \ - HistoryView.m \ - HistoryWindowController.m \ - FormSelectMenu.m \ - bitmap.m \ - fetch.m \ - font.m \ - gui.m \ - plotter.m \ - schedule.m \ - selection.m \ - ArrowBox.m \ - ArrowWindow.m \ - BlackScroller.m \ - LocalHistoryController.m \ +# sources purely for the Mac OS X build +S_FRONTEND := \ + BookmarksController.m \ + BrowserView.m \ + BrowserViewController.m \ + BrowserWindowController.m \ + BrowserWindow.m \ + DownloadWindowController.m \ + NetSurfAppDelegate.m \ + NetsurfApp.m \ + PreferencesWindowController.m \ + ScrollableView.m \ + SearchWindowController.m \ + URLFieldCell.m \ + Tree.m \ + TreeView.m \ + HistoryView.m \ + HistoryWindowController.m \ + FormSelectMenu.m \ + bitmap.m \ + fetch.m \ + font.m \ + gui.m \ + plotter.m \ + schedule.m \ + selection.m \ + ArrowBox.m \ + ArrowWindow.m \ + BlackScroller.m \ + LocalHistoryController.m \ apple_image.m S_TABBAR := \ @@ -105,23 +96,22 @@ S_TABBAR := \ NSString_AITruncation.m \ PSMOverflowPopUpButton.m \ PSMProgressIndicator.m \ - PSMRolloverButton.m \ - PSMTabBarCell.m \ - PSMTabBarControl.m \ + PSMRolloverButton.m \ + PSMTabBarCell.m \ + PSMTabBarControl.m \ PSMTabBarController.m \ PSMTabDragAssistant.m \ - PSMTabDragView.m \ - PSMTabDragWindow.m \ - PSMTabDragWindowController.m \ + PSMTabDragView.m \ + PSMTabDragWindow.m \ + PSMTabDragWindowController.m \ PSMUnifiedTabStyle.m -S_COCOA := $(addprefix cocoa/,$(S_COCOA)) -S_TABBAR := $(addprefix cocoa/PSMTabBarControl/,$(S_TABBAR)) +S_FRONTEND += $(addprefix PSMTabBarControl/,$(S_TABBAR)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_COCOA) $(S_TABBAR)) +SOURCES = $(addprefix $(shell pwd)/,$(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND)) # Since we prefix the sources with the pwd, also create a special # prefixed rule so that the testament is run @@ -129,31 +119,50 @@ $(shell pwd)/content/fetchers/about.c: testament EXETARGET := NetSurf -S_XIBS := MainMenu.xib Browser.xib BrowserWindow.xib DownloadWindow.xib SearchWindow.xib PreferencesWindow.xib \ - HistoryWindow.xib BookmarksWindow.xib LocalHistoryPanel.xib +S_XIBS := \ + MainMenu.xib \ + Browser.xib \ + BrowserWindow.xib \ + DownloadWindow.xib \ + SearchWindow.xib \ + PreferencesWindow.xib \ + HistoryWindow.xib \ + BookmarksWindow.xib \ + LocalHistoryPanel.xib -R_RESOURCES := default.css adblock.css internal.css quirks.css NetSurf.icns HomeTemplate.pdf Icons ca-bundle \ +R_RESOURCES := \ + default.css \ + adblock.css \ + internal.css \ + quirks.css \ + NetSurf.icns \ + HomeTemplate.pdf \ + Icons \ + ca-bundle \ netsurf.png -R_RESOURCES := $(addprefix cocoa/res/,$(R_RESOURCES)) + + +TABBAR_RESOURCES := \ + AquaTabClose_Front_Pressed.png \ + AquaTabClose_Front_Rollover.png \ + AquaTabClose_Front.png \ + AquaTabCloseDirty_Front_Pressed.png \ + AquaTabCloseDirty_Front_Rollover.png \ + AquaTabCloseDirty_Front.png \ + AquaTabNew.png \ + AquaTabNewPressed.png \ + AquaTabNewRollover.png \ + overflowImage.png \ + overflowImagePressed.png \ + pi.png + +R_RESOURCES += $(addprefix PSMTabBarControl/Images/,$(TABBAR_RESOURCES)) + +R_RESOURCES := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(R_RESOURCES)) LANGUAGES := de en fr it nl LOCALIZED_RESOURCES := Localizable.strings -TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \ - AquaTabClose_Front_Rollover.png \ - AquaTabClose_Front.png \ - AquaTabCloseDirty_Front_Pressed.png \ - AquaTabCloseDirty_Front_Rollover.png \ - AquaTabCloseDirty_Front.png \ - AquaTabNew.png \ - AquaTabNewPressed.png \ - AquaTabNewRollover.png \ - overflowImage.png \ - overflowImagePressed.png \ - pi.png - -R_RESOURCES += $(addprefix cocoa/PSMTabBarControl/Images/,$(TABBAR_RESOURCES)) - #languiage project macro # $1 is language name # $2 is list of resources per language @@ -170,13 +179,13 @@ endef define compile_xib $$(OBJROOT)/$(2).lproj: $$(OBJROOT)/$(2).lproj/$(1:.xib=.nib) -$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(1) $$(OBJROOT)/created +$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(1) $$(OBJROOT)/created $(VQ)echo Compiling XIB $(1) for language $(2) $(Q)mkdir -p $$(OBJROOT)/$(2).lproj - $(Q)cocoa/compile-xib.sh cocoa/res/$(1) $(2) $$@ + $(Q)cocoa/compile-xib.sh $(FRONTEND_RESOURCES_DIR)/$(1) $(2) $$@ -ifeq ($(wildcard cocoa/res/$(2).lproj/$(1).strings),cocoa/res/$(2).lproj/$(1).strings) -$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): cocoa/res/$(2).lproj/$(1).strings +ifeq ($(wildcard $(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings),$(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings) +$$(OBJROOT)/$(2).lproj/$(1:.xib=.nib): $(FRONTEND_RESOURCES_DIR)/$(2).lproj/$(1).strings endif endef @@ -190,7 +199,7 @@ $(foreach lang,$(LANGUAGES),$(foreach xib,$(S_XIBS),$(eval $(call compile_xib,$( install-cocoa: NetSurf.app -NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) NetSurf.app/Contents/Info.plist +NetSurf.app: NetSurf $(FRONTEND_SOURCE_DIR)/Makefile $(R_RESOURCES) NetSurf.app/Contents/Info.plist $(VQ)echo Assembling NetSurf.app bundle $(Q)mkdir -p NetSurf.app/Contents/MacOS $(Q)cp NetSurf NetSurf.app/Contents/MacOS @@ -199,7 +208,7 @@ NetSurf.app: NetSurf cocoa/Makefile.target $(R_RESOURCES) NetSurf.app/Contents/I $(Q)cp -pLR $(R_RESOURCES) NetSurf.app/Contents/Resources $(Q)echo 'APPL????' > NetSurf.app/Contents/PkgInfo -NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.target +NetSurf.app/Contents/Info.plist: $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist $(FRONTEND_SOURCE_DIR)/Makefile $(VQ)echo Generating Info.plist $(Q)mkdir -p NetSurf.app/Contents $(Q)sed -e 's/$${EXECUTABLE_NAME}/$(EXETARGET)/' \ @@ -207,7 +216,7 @@ NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \ -e 's/$${NETSURF_VERSION}/$(VERSION_FULL)/' \ -e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/' \ - < cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist + < $(FRONTEND_RESOURCES_DIR)/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist # ---------------------------------------------------------------------------- # Package target diff --git a/cocoa/Makefile.defaults b/frontends/cocoa/Makefile.defaults similarity index 100% rename from cocoa/Makefile.defaults rename to frontends/cocoa/Makefile.defaults diff --git a/cocoa/NetSurf.xcodeproj/project.pbxproj b/frontends/cocoa/NetSurf.xcodeproj/project.pbxproj similarity index 100% rename from cocoa/NetSurf.xcodeproj/project.pbxproj rename to frontends/cocoa/NetSurf.xcodeproj/project.pbxproj diff --git a/cocoa/NetSurfAppDelegate.h b/frontends/cocoa/NetSurfAppDelegate.h similarity index 100% rename from cocoa/NetSurfAppDelegate.h rename to frontends/cocoa/NetSurfAppDelegate.h diff --git a/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m similarity index 100% rename from cocoa/NetSurfAppDelegate.m rename to frontends/cocoa/NetSurfAppDelegate.m diff --git a/cocoa/NetsurfApp.h b/frontends/cocoa/NetsurfApp.h similarity index 100% rename from cocoa/NetsurfApp.h rename to frontends/cocoa/NetsurfApp.h diff --git a/cocoa/NetsurfApp.m b/frontends/cocoa/NetsurfApp.m similarity index 100% rename from cocoa/NetsurfApp.m rename to frontends/cocoa/NetsurfApp.m diff --git a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Pressed.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabCloseDirty_Front_Rollover.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Pressed.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabClose_Front_Rollover.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabNew.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNew.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabNew.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabNew.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabNewPressed.png diff --git a/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png b/frontends/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png rename to frontends/cocoa/PSMTabBarControl/Images/AquaTabNewRollover.png diff --git a/cocoa/PSMTabBarControl/Images/overflowImage.png b/frontends/cocoa/PSMTabBarControl/Images/overflowImage.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/overflowImage.png rename to frontends/cocoa/PSMTabBarControl/Images/overflowImage.png diff --git a/cocoa/PSMTabBarControl/Images/overflowImagePressed.png b/frontends/cocoa/PSMTabBarControl/Images/overflowImagePressed.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/overflowImagePressed.png rename to frontends/cocoa/PSMTabBarControl/Images/overflowImagePressed.png diff --git a/cocoa/PSMTabBarControl/Images/pi.png b/frontends/cocoa/PSMTabBarControl/Images/pi.png similarity index 100% rename from cocoa/PSMTabBarControl/Images/pi.png rename to frontends/cocoa/PSMTabBarControl/Images/pi.png diff --git a/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h similarity index 100% rename from cocoa/PSMTabBarControl/NSBezierPath_AMShading.h rename to frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.h diff --git a/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m b/frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m similarity index 100% rename from cocoa/PSMTabBarControl/NSBezierPath_AMShading.m rename to frontends/cocoa/PSMTabBarControl/NSBezierPath_AMShading.m diff --git a/cocoa/PSMTabBarControl/NSString_AITruncation.h b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.h similarity index 100% rename from cocoa/PSMTabBarControl/NSString_AITruncation.h rename to frontends/cocoa/PSMTabBarControl/NSString_AITruncation.h diff --git a/cocoa/PSMTabBarControl/NSString_AITruncation.m b/frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m similarity index 100% rename from cocoa/PSMTabBarControl/NSString_AITruncation.m rename to frontends/cocoa/PSMTabBarControl/NSString_AITruncation.m diff --git a/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h rename to frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.h diff --git a/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m b/frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m rename to frontends/cocoa/PSMTabBarControl/PSMOverflowPopUpButton.m diff --git a/cocoa/PSMTabBarControl/PSMProgressIndicator.h b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMProgressIndicator.h rename to frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.h diff --git a/cocoa/PSMTabBarControl/PSMProgressIndicator.m b/frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMProgressIndicator.m rename to frontends/cocoa/PSMTabBarControl/PSMProgressIndicator.m diff --git a/cocoa/PSMTabBarControl/PSMRolloverButton.h b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMRolloverButton.h rename to frontends/cocoa/PSMTabBarControl/PSMRolloverButton.h diff --git a/cocoa/PSMTabBarControl/PSMRolloverButton.m b/frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMRolloverButton.m rename to frontends/cocoa/PSMTabBarControl/PSMRolloverButton.m diff --git a/cocoa/PSMTabBarControl/PSMTabBarCell.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabBarCell.h rename to frontends/cocoa/PSMTabBarControl/PSMTabBarCell.h diff --git a/cocoa/PSMTabBarControl/PSMTabBarCell.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabBarCell.m rename to frontends/cocoa/PSMTabBarControl/PSMTabBarCell.m diff --git a/cocoa/PSMTabBarControl/PSMTabBarControl.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabBarControl.h rename to frontends/cocoa/PSMTabBarControl/PSMTabBarControl.h diff --git a/cocoa/PSMTabBarControl/PSMTabBarControl.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabBarControl.m rename to frontends/cocoa/PSMTabBarControl/PSMTabBarControl.m diff --git a/cocoa/PSMTabBarControl/PSMTabBarController.h b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabBarController.h rename to frontends/cocoa/PSMTabBarControl/PSMTabBarController.h diff --git a/cocoa/PSMTabBarControl/PSMTabBarController.m b/frontends/cocoa/PSMTabBarControl/PSMTabBarController.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabBarController.m rename to frontends/cocoa/PSMTabBarControl/PSMTabBarController.m diff --git a/cocoa/PSMTabBarControl/PSMTabDragAssistant.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragAssistant.h rename to frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.h diff --git a/cocoa/PSMTabBarControl/PSMTabDragAssistant.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragAssistant.m rename to frontends/cocoa/PSMTabBarControl/PSMTabDragAssistant.m diff --git a/cocoa/PSMTabBarControl/PSMTabDragView.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragView.h rename to frontends/cocoa/PSMTabBarControl/PSMTabDragView.h diff --git a/cocoa/PSMTabBarControl/PSMTabDragView.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragView.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragView.m rename to frontends/cocoa/PSMTabBarControl/PSMTabDragView.m diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindow.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragWindow.h rename to frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.h diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindow.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragWindow.m rename to frontends/cocoa/PSMTabBarControl/PSMTabDragWindow.m diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindowController.h b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragWindowController.h rename to frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.h diff --git a/cocoa/PSMTabBarControl/PSMTabDragWindowController.m b/frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabDragWindowController.m rename to frontends/cocoa/PSMTabBarControl/PSMTabDragWindowController.m diff --git a/cocoa/PSMTabBarControl/PSMTabStyle.h b/frontends/cocoa/PSMTabBarControl/PSMTabStyle.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMTabStyle.h rename to frontends/cocoa/PSMTabBarControl/PSMTabStyle.h diff --git a/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h similarity index 100% rename from cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h rename to frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.h diff --git a/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m b/frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m similarity index 100% rename from cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m rename to frontends/cocoa/PSMTabBarControl/PSMUnifiedTabStyle.m diff --git a/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf b/frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf similarity index 100% rename from cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf rename to frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/TXT.rtf diff --git a/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif b/frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif similarity index 100% rename from cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif rename to frontends/cocoa/PSMTabBarControl/ReadMe.rtfd/startpage.gif diff --git a/cocoa/PreferencesWindowController.h b/frontends/cocoa/PreferencesWindowController.h similarity index 100% rename from cocoa/PreferencesWindowController.h rename to frontends/cocoa/PreferencesWindowController.h diff --git a/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m similarity index 100% rename from cocoa/PreferencesWindowController.m rename to frontends/cocoa/PreferencesWindowController.m diff --git a/cocoa/Prefix.pch b/frontends/cocoa/Prefix.pch similarity index 100% rename from cocoa/Prefix.pch rename to frontends/cocoa/Prefix.pch diff --git a/cocoa/ScrollableView.h b/frontends/cocoa/ScrollableView.h similarity index 100% rename from cocoa/ScrollableView.h rename to frontends/cocoa/ScrollableView.h diff --git a/cocoa/ScrollableView.m b/frontends/cocoa/ScrollableView.m similarity index 100% rename from cocoa/ScrollableView.m rename to frontends/cocoa/ScrollableView.m diff --git a/cocoa/SearchWindowController.h b/frontends/cocoa/SearchWindowController.h similarity index 100% rename from cocoa/SearchWindowController.h rename to frontends/cocoa/SearchWindowController.h diff --git a/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m similarity index 100% rename from cocoa/SearchWindowController.m rename to frontends/cocoa/SearchWindowController.m diff --git a/cocoa/Tree.h b/frontends/cocoa/Tree.h similarity index 100% rename from cocoa/Tree.h rename to frontends/cocoa/Tree.h diff --git a/cocoa/Tree.m b/frontends/cocoa/Tree.m similarity index 100% rename from cocoa/Tree.m rename to frontends/cocoa/Tree.m diff --git a/cocoa/TreeView.h b/frontends/cocoa/TreeView.h similarity index 100% rename from cocoa/TreeView.h rename to frontends/cocoa/TreeView.h diff --git a/cocoa/TreeView.m b/frontends/cocoa/TreeView.m similarity index 100% rename from cocoa/TreeView.m rename to frontends/cocoa/TreeView.m diff --git a/cocoa/URLFieldCell.h b/frontends/cocoa/URLFieldCell.h similarity index 100% rename from cocoa/URLFieldCell.h rename to frontends/cocoa/URLFieldCell.h diff --git a/cocoa/URLFieldCell.m b/frontends/cocoa/URLFieldCell.m similarity index 100% rename from cocoa/URLFieldCell.m rename to frontends/cocoa/URLFieldCell.m diff --git a/cocoa/apple_image.h b/frontends/cocoa/apple_image.h similarity index 100% rename from cocoa/apple_image.h rename to frontends/cocoa/apple_image.h diff --git a/cocoa/apple_image.m b/frontends/cocoa/apple_image.m similarity index 100% rename from cocoa/apple_image.m rename to frontends/cocoa/apple_image.m diff --git a/cocoa/bitmap.h b/frontends/cocoa/bitmap.h similarity index 100% rename from cocoa/bitmap.h rename to frontends/cocoa/bitmap.h diff --git a/cocoa/bitmap.m b/frontends/cocoa/bitmap.m similarity index 100% rename from cocoa/bitmap.m rename to frontends/cocoa/bitmap.m diff --git a/cocoa/compile-xib.sh b/frontends/cocoa/compile-xib.sh similarity index 100% rename from cocoa/compile-xib.sh rename to frontends/cocoa/compile-xib.sh diff --git a/cocoa/coordinates.h b/frontends/cocoa/coordinates.h similarity index 100% rename from cocoa/coordinates.h rename to frontends/cocoa/coordinates.h diff --git a/cocoa/extract-strings.sh b/frontends/cocoa/extract-strings.sh similarity index 100% rename from cocoa/extract-strings.sh rename to frontends/cocoa/extract-strings.sh diff --git a/cocoa/fetch.h b/frontends/cocoa/fetch.h similarity index 100% rename from cocoa/fetch.h rename to frontends/cocoa/fetch.h diff --git a/cocoa/fetch.m b/frontends/cocoa/fetch.m similarity index 100% rename from cocoa/fetch.m rename to frontends/cocoa/fetch.m diff --git a/cocoa/font.h b/frontends/cocoa/font.h similarity index 100% rename from cocoa/font.h rename to frontends/cocoa/font.h diff --git a/cocoa/font.m b/frontends/cocoa/font.m similarity index 100% rename from cocoa/font.m rename to frontends/cocoa/font.m diff --git a/cocoa/gui.h b/frontends/cocoa/gui.h similarity index 100% rename from cocoa/gui.h rename to frontends/cocoa/gui.h diff --git a/cocoa/gui.m b/frontends/cocoa/gui.m similarity index 100% rename from cocoa/gui.m rename to frontends/cocoa/gui.m diff --git a/cocoa/plotter.h b/frontends/cocoa/plotter.h similarity index 100% rename from cocoa/plotter.h rename to frontends/cocoa/plotter.h diff --git a/cocoa/plotter.m b/frontends/cocoa/plotter.m similarity index 100% rename from cocoa/plotter.m rename to frontends/cocoa/plotter.m diff --git a/cocoa/res/BookmarksWindow.xib b/frontends/cocoa/res/BookmarksWindow.xib similarity index 100% rename from cocoa/res/BookmarksWindow.xib rename to frontends/cocoa/res/BookmarksWindow.xib diff --git a/cocoa/res/Browser.xib b/frontends/cocoa/res/Browser.xib similarity index 100% rename from cocoa/res/Browser.xib rename to frontends/cocoa/res/Browser.xib diff --git a/cocoa/res/BrowserWindow.xib b/frontends/cocoa/res/BrowserWindow.xib similarity index 100% rename from cocoa/res/BrowserWindow.xib rename to frontends/cocoa/res/BrowserWindow.xib diff --git a/cocoa/res/DownloadWindow.xib b/frontends/cocoa/res/DownloadWindow.xib similarity index 100% rename from cocoa/res/DownloadWindow.xib rename to frontends/cocoa/res/DownloadWindow.xib diff --git a/cocoa/res/HistoryWindow.xib b/frontends/cocoa/res/HistoryWindow.xib similarity index 100% rename from cocoa/res/HistoryWindow.xib rename to frontends/cocoa/res/HistoryWindow.xib diff --git a/cocoa/res/HomeTemplate.pdf b/frontends/cocoa/res/HomeTemplate.pdf similarity index 100% rename from cocoa/res/HomeTemplate.pdf rename to frontends/cocoa/res/HomeTemplate.pdf diff --git a/frontends/cocoa/res/Icons b/frontends/cocoa/res/Icons new file mode 120000 index 000000000..187efd6f9 --- /dev/null +++ b/frontends/cocoa/res/Icons @@ -0,0 +1 @@ +../../../!NetSurf/Resources/Icons/ \ No newline at end of file diff --git a/cocoa/res/LocalHistoryPanel.xib b/frontends/cocoa/res/LocalHistoryPanel.xib similarity index 100% rename from cocoa/res/LocalHistoryPanel.xib rename to frontends/cocoa/res/LocalHistoryPanel.xib diff --git a/cocoa/res/MainMenu.xib b/frontends/cocoa/res/MainMenu.xib similarity index 100% rename from cocoa/res/MainMenu.xib rename to frontends/cocoa/res/MainMenu.xib diff --git a/cocoa/res/NetSurf-Info.plist b/frontends/cocoa/res/NetSurf-Info.plist similarity index 100% rename from cocoa/res/NetSurf-Info.plist rename to frontends/cocoa/res/NetSurf-Info.plist diff --git a/cocoa/res/NetSurf.icns b/frontends/cocoa/res/NetSurf.icns similarity index 100% rename from cocoa/res/NetSurf.icns rename to frontends/cocoa/res/NetSurf.icns diff --git a/cocoa/res/PreferencesWindow.xib b/frontends/cocoa/res/PreferencesWindow.xib similarity index 100% rename from cocoa/res/PreferencesWindow.xib rename to frontends/cocoa/res/PreferencesWindow.xib diff --git a/cocoa/res/SearchWindow.xib b/frontends/cocoa/res/SearchWindow.xib similarity index 100% rename from cocoa/res/SearchWindow.xib rename to frontends/cocoa/res/SearchWindow.xib diff --git a/frontends/cocoa/res/adblock.css b/frontends/cocoa/res/adblock.css new file mode 120000 index 000000000..ff2485622 --- /dev/null +++ b/frontends/cocoa/res/adblock.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/frontends/cocoa/res/ca-bundle b/frontends/cocoa/res/ca-bundle new file mode 120000 index 000000000..0b0e416ad --- /dev/null +++ b/frontends/cocoa/res/ca-bundle @@ -0,0 +1 @@ +../../../!NetSurf/Resources/ca-bundle \ No newline at end of file diff --git a/cocoa/res/de.lproj/BookmarksWindow.xib.strings b/frontends/cocoa/res/de.lproj/BookmarksWindow.xib.strings similarity index 100% rename from cocoa/res/de.lproj/BookmarksWindow.xib.strings rename to frontends/cocoa/res/de.lproj/BookmarksWindow.xib.strings diff --git a/cocoa/res/de.lproj/BrowserWindow.xib.strings b/frontends/cocoa/res/de.lproj/BrowserWindow.xib.strings similarity index 100% rename from cocoa/res/de.lproj/BrowserWindow.xib.strings rename to frontends/cocoa/res/de.lproj/BrowserWindow.xib.strings diff --git a/cocoa/res/de.lproj/DownloadWindow.xib.strings b/frontends/cocoa/res/de.lproj/DownloadWindow.xib.strings similarity index 100% rename from cocoa/res/de.lproj/DownloadWindow.xib.strings rename to frontends/cocoa/res/de.lproj/DownloadWindow.xib.strings diff --git a/cocoa/res/de.lproj/HistoryWindow.xib.strings b/frontends/cocoa/res/de.lproj/HistoryWindow.xib.strings similarity index 100% rename from cocoa/res/de.lproj/HistoryWindow.xib.strings rename to frontends/cocoa/res/de.lproj/HistoryWindow.xib.strings diff --git a/cocoa/res/de.lproj/Localizable.strings b/frontends/cocoa/res/de.lproj/Localizable.strings similarity index 100% rename from cocoa/res/de.lproj/Localizable.strings rename to frontends/cocoa/res/de.lproj/Localizable.strings diff --git a/cocoa/res/de.lproj/MainMenu.xib.strings b/frontends/cocoa/res/de.lproj/MainMenu.xib.strings similarity index 100% rename from cocoa/res/de.lproj/MainMenu.xib.strings rename to frontends/cocoa/res/de.lproj/MainMenu.xib.strings diff --git a/frontends/cocoa/res/de.lproj/Messages b/frontends/cocoa/res/de.lproj/Messages new file mode 120000 index 000000000..32530a151 --- /dev/null +++ b/frontends/cocoa/res/de.lproj/Messages @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/de/Messages \ No newline at end of file diff --git a/cocoa/res/de.lproj/PreferencesWindow.xib.strings b/frontends/cocoa/res/de.lproj/PreferencesWindow.xib.strings similarity index 100% rename from cocoa/res/de.lproj/PreferencesWindow.xib.strings rename to frontends/cocoa/res/de.lproj/PreferencesWindow.xib.strings diff --git a/cocoa/res/de.lproj/SearchWindow.xib.strings b/frontends/cocoa/res/de.lproj/SearchWindow.xib.strings similarity index 100% rename from cocoa/res/de.lproj/SearchWindow.xib.strings rename to frontends/cocoa/res/de.lproj/SearchWindow.xib.strings diff --git a/frontends/cocoa/res/default.css b/frontends/cocoa/res/default.css new file mode 120000 index 000000000..a8579eb7c --- /dev/null +++ b/frontends/cocoa/res/default.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/cocoa/res/en.lproj/Localizable.strings b/frontends/cocoa/res/en.lproj/Localizable.strings similarity index 100% rename from cocoa/res/en.lproj/Localizable.strings rename to frontends/cocoa/res/en.lproj/Localizable.strings diff --git a/frontends/cocoa/res/en.lproj/Messages b/frontends/cocoa/res/en.lproj/Messages new file mode 120000 index 000000000..a26483244 --- /dev/null +++ b/frontends/cocoa/res/en.lproj/Messages @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/en/Messages \ No newline at end of file diff --git a/cocoa/res/fr.lproj/Localizable.strings b/frontends/cocoa/res/fr.lproj/Localizable.strings similarity index 100% rename from cocoa/res/fr.lproj/Localizable.strings rename to frontends/cocoa/res/fr.lproj/Localizable.strings diff --git a/frontends/cocoa/res/fr.lproj/Messages b/frontends/cocoa/res/fr.lproj/Messages new file mode 120000 index 000000000..467559b12 --- /dev/null +++ b/frontends/cocoa/res/fr.lproj/Messages @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/fr/Messages \ No newline at end of file diff --git a/frontends/cocoa/res/internal.css b/frontends/cocoa/res/internal.css new file mode 120000 index 000000000..17f9f1504 --- /dev/null +++ b/frontends/cocoa/res/internal.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/cocoa/res/it.lproj/Localizable.strings b/frontends/cocoa/res/it.lproj/Localizable.strings similarity index 100% rename from cocoa/res/it.lproj/Localizable.strings rename to frontends/cocoa/res/it.lproj/Localizable.strings diff --git a/frontends/cocoa/res/it.lproj/Messages b/frontends/cocoa/res/it.lproj/Messages new file mode 120000 index 000000000..00fc6d1ed --- /dev/null +++ b/frontends/cocoa/res/it.lproj/Messages @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/it/Messages \ No newline at end of file diff --git a/frontends/cocoa/res/netsurf.png b/frontends/cocoa/res/netsurf.png new file mode 120000 index 000000000..905512c25 --- /dev/null +++ b/frontends/cocoa/res/netsurf.png @@ -0,0 +1 @@ +../../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/cocoa/res/nl.lproj/Localizable.strings b/frontends/cocoa/res/nl.lproj/Localizable.strings similarity index 100% rename from cocoa/res/nl.lproj/Localizable.strings rename to frontends/cocoa/res/nl.lproj/Localizable.strings diff --git a/frontends/cocoa/res/nl.lproj/Messages b/frontends/cocoa/res/nl.lproj/Messages new file mode 120000 index 000000000..c8a9cbe81 --- /dev/null +++ b/frontends/cocoa/res/nl.lproj/Messages @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/nl/Messages \ No newline at end of file diff --git a/frontends/cocoa/res/quirks.css b/frontends/cocoa/res/quirks.css new file mode 120000 index 000000000..88aabe48c --- /dev/null +++ b/frontends/cocoa/res/quirks.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/cocoa/schedule.h b/frontends/cocoa/schedule.h similarity index 100% rename from cocoa/schedule.h rename to frontends/cocoa/schedule.h diff --git a/cocoa/schedule.m b/frontends/cocoa/schedule.m similarity index 100% rename from cocoa/schedule.m rename to frontends/cocoa/schedule.m diff --git a/cocoa/selection.h b/frontends/cocoa/selection.h similarity index 100% rename from cocoa/selection.h rename to frontends/cocoa/selection.h diff --git a/cocoa/selection.m b/frontends/cocoa/selection.m similarity index 100% rename from cocoa/selection.m rename to frontends/cocoa/selection.m diff --git a/framebuffer/Makefile.target b/frontends/framebuffer/Makefile similarity index 51% rename from framebuffer/Makefile.target rename to frontends/framebuffer/Makefile index 44fa5aa4a..15888aebc 100644 --- a/framebuffer/Makefile.target +++ b/frontends/framebuffer/Makefile @@ -2,16 +2,6 @@ # Framebuffer target setup # ---------------------------------------------------------------------------- -# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here -NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG -NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE -NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB -NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 -NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 - CFLAGS += -Dnsframebuffer #resource path @@ -43,71 +33,52 @@ LDFLAGS += -Wl,--whole-archive $(eval $(call pkg_config_find_and_add,libnsfb,libnsfb)) LDFLAGS += -Wl,--no-whole-archive -$(eval $(call pkg_config_find_and_add,openssl,OpenSSL)) - -# freemint does not support pkg-config for libcurl -ifeq ($(HOST),mint) - CFLAGS += $(shell curl-config --cflags) - LDFLAGS += $(shell curl-config --libs) - LDFLAGS += -L/usr/lib/ -lz -liconv -else - $(eval $(call pkg_config_find_and_add,libcurl,Curl )) -endif - # freetype is optional but does not use pkg-config ifeq ($(NETSURF_FB_FONTLIB),freetype) CFLAGS += -DFB_USE_FREETYPE $(shell freetype-config --cflags) LDFLAGS += $(shell freetype-config --libs) endif -# optional pkg configured libraries -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) -$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) -$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) - # ---------------------------------------------------------------------------- # built-in resource setup # ---------------------------------------------------------------------------- -FB_IMAGE_left_arrow := framebuffer/res/icons/back.png -FB_IMAGE_right_arrow := framebuffer/res/icons/forward.png -FB_IMAGE_reload := framebuffer/res/icons/reload.png -FB_IMAGE_stop_image := framebuffer/res/icons/stop.png -FB_IMAGE_history_image := framebuffer/res/icons/history.png +FB_IMAGE_left_arrow := icons/back.png +FB_IMAGE_right_arrow := icons/forward.png +FB_IMAGE_reload := icons/reload.png +FB_IMAGE_stop_image := icons/stop.png +FB_IMAGE_history_image := icons/history.png -FB_IMAGE_left_arrow_g := framebuffer/res/icons/back_g.png -FB_IMAGE_right_arrow_g := framebuffer/res/icons/forward_g.png -FB_IMAGE_reload_g := framebuffer/res/icons/reload_g.png -FB_IMAGE_stop_image_g := framebuffer/res/icons/stop_g.png -FB_IMAGE_history_image_g := framebuffer/res/icons/history_g.png +FB_IMAGE_left_arrow_g := icons/back_g.png +FB_IMAGE_right_arrow_g := icons/forward_g.png +FB_IMAGE_reload_g := icons/reload_g.png +FB_IMAGE_stop_image_g := icons/stop_g.png +FB_IMAGE_history_image_g := icons/history_g.png -FB_IMAGE_scrolll := framebuffer/res/icons/scrolll.png -FB_IMAGE_scrollr := framebuffer/res/icons/scrollr.png -FB_IMAGE_scrollu := framebuffer/res/icons/scrollu.png -FB_IMAGE_scrolld := framebuffer/res/icons/scrolld.png +FB_IMAGE_scrolll := icons/scrolll.png +FB_IMAGE_scrollr := icons/scrollr.png +FB_IMAGE_scrollu := icons/scrollu.png +FB_IMAGE_scrolld := icons/scrolld.png -FB_IMAGE_osk_image := framebuffer/res/icons/osk.png +FB_IMAGE_osk_image := icons/osk.png -FB_IMAGE_pointer_image := framebuffer/res/pointers/default.png -FB_IMAGE_hand_image := framebuffer/res/pointers/point.png -FB_IMAGE_caret_image := framebuffer/res/pointers/caret.png -FB_IMAGE_menu_image := framebuffer/res/pointers/menu.png -FB_IMAGE_progress_image := framebuffer/res/pointers/progress.png -FB_IMAGE_move_image := framebuffer/res/pointers/move.png +FB_IMAGE_pointer_image := pointers/default.png +FB_IMAGE_hand_image := pointers/point.png +FB_IMAGE_caret_image := pointers/caret.png +FB_IMAGE_menu_image := pointers/menu.png +FB_IMAGE_progress_image := pointers/progress.png +FB_IMAGE_move_image := pointers/move.png -FB_IMAGE_throbber0 := framebuffer/res/throbber/throbber0.png -FB_IMAGE_throbber1 := framebuffer/res/throbber/throbber1.png -FB_IMAGE_throbber2 := framebuffer/res/throbber/throbber2.png -FB_IMAGE_throbber3 := framebuffer/res/throbber/throbber3.png -FB_IMAGE_throbber4 := framebuffer/res/throbber/throbber4.png -FB_IMAGE_throbber5 := framebuffer/res/throbber/throbber5.png -FB_IMAGE_throbber6 := framebuffer/res/throbber/throbber6.png -FB_IMAGE_throbber7 := framebuffer/res/throbber/throbber7.png -FB_IMAGE_throbber8 := framebuffer/res/throbber/throbber8.png +FB_IMAGE_throbber0 := throbber/throbber0.png +FB_IMAGE_throbber1 := throbber/throbber1.png +FB_IMAGE_throbber2 := throbber/throbber2.png +FB_IMAGE_throbber3 := throbber/throbber3.png +FB_IMAGE_throbber4 := throbber/throbber4.png +FB_IMAGE_throbber5 := throbber/throbber5.png +FB_IMAGE_throbber6 := throbber/throbber6.png +FB_IMAGE_throbber7 := throbber/throbber7.png +FB_IMAGE_throbber8 := throbber/throbber8.png # local compiler flags ifeq ($(HOST),OpenBSD) @@ -122,9 +93,9 @@ endif # # convert_image dependd on fb_bitmap.h so that if we change that # header, we get new images built. -$(TOOLROOT)/convert_image: $(TOOLROOT)/created framebuffer/convert_image.c framebuffer/fbtk.h +$(TOOLROOT)/convert_image: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/convert_image.c $(FRONTEND_SOURCE_DIR)/fbtk.h $(VQ)echo " HOST CC: $@" - $(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ framebuffer/convert_image.c $(HOST_LDFLAGS) + $(Q)$(HOST_CC) $(HOST_CFLAGS) -o $@ $(FRONTEND_SOURCE_DIR)/convert_image.c $(HOST_LDFLAGS) # 1: input file # 2: output file @@ -140,16 +111,16 @@ endef S_IMAGES := -$(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/image-$(patsubst FB_IMAGE_%,%,$(V)).c,$(patsubst FB_IMAGE_%,%,$(V))))) +$(eval $(foreach V,$(filter FB_IMAGE_%,$(.VARIABLES)),$(call convert_image,$(FRONTEND_RESOURCES_DIR)/$($(V)),$(OBJROOT)/image-$(patsubst FB_IMAGE_%,%,$(V)).c,$(patsubst FB_IMAGE_%,%,$(V))))) # Internal fonts to generate -FB_FONT_internal_ns-sans := framebuffer/res/fonts/glyph_data +FB_FONT_internal_ns-sans := fonts/glyph_data # Internal font conversion -$(TOOLROOT)/convert_font: $(TOOLROOT)/created framebuffer/convert_font.c +$(TOOLROOT)/convert_font: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/convert_font.c $(VQ)echo " HOST CC: $@" - $(Q)$(HOST_CC) -o $@ framebuffer/convert_font.c + $(Q)$(HOST_CC) -o $@ $(FRONTEND_SOURCE_DIR)/convert_font.c # 1: input file # 2: output source code file @@ -167,27 +138,28 @@ endef S_FONTS := -$(eval $(foreach V,$(filter FB_FONT_$(NETSURF_FB_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).h,$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V))))) +$(eval $(foreach V,$(filter FB_FONT_$(NETSURF_FB_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$(FRONTEND_RESOURCES_DIR)/$($(V)),$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V)).h,$(patsubst FB_FONT_$(NETSURF_FB_FONTLIB)_%,%,$(V))))) # ---------------------------------------------------------------------------- # Source file setup # ---------------------------------------------------------------------------- -# S_FRAMEBUFFER are sources purely for the framebuffer build -S_FRAMEBUFFER := gui.c framebuffer.c schedule.c bitmap.c fetch.c \ +# S_FRONTEND are sources purely for the framebuffer build +S_FRONTEND := gui.c framebuffer.c schedule.c bitmap.c fetch.c \ findfile.c localhistory.c clipboard.c +# toolkit sources S_FRAMEBUFFER_FBTK := fbtk.c event.c fill.c bitmap.c user.c window.c \ text.c scroll.c osk.c -S_FRAMEBUFFER += font_$(NETSURF_FB_FONTLIB).c +S_FRONTEND += font_$(NETSURF_FB_FONTLIB).c -S_FRAMEBUFFER := $(addprefix framebuffer/,$(S_FRAMEBUFFER)) $(addprefix framebuffer/fbtk/,$(S_FRAMEBUFFER_FBTK)) +S_FRONTEND += $(addprefix fbtk/,$(S_FRAMEBUFFER_FBTK)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRAMEBUFFER) $(S_IMAGES) $(S_FONTS) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES) $(S_FONTS) EXETARGET := nsfb # ---------------------------------------------------------------------------- diff --git a/framebuffer/Makefile.defaults b/frontends/framebuffer/Makefile.defaults similarity index 96% rename from framebuffer/Makefile.defaults rename to frontends/framebuffer/Makefile.defaults index 5fe8e2c40..fe54daafe 100644 --- a/framebuffer/Makefile.defaults +++ b/frontends/framebuffer/Makefile.defaults @@ -40,7 +40,7 @@ NETSURF_FRAMEBUFFER_BIN := $(PREFIX)/bin/ NETSURF_FRAMEBUFFER_RESOURCES := $(PREFIX)/share/netsurf/ # Default framebuffer search path -NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./framebuffer/res +NETSURF_FB_RESPATH := $${HOME}/.netsurf/:$${NETSURFRES}:$(NETSURF_FRAMEBUFFER_RESOURCES):./frontends/framebuffer/res # freetype compiled in font serch path NETSURF_FB_FONTPATH := /usr/share/fonts/truetype/ttf-dejavu:/usr/share/fonts/truetype/msttcorefonts diff --git a/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c similarity index 100% rename from framebuffer/bitmap.c rename to frontends/framebuffer/bitmap.c diff --git a/framebuffer/bitmap.h b/frontends/framebuffer/bitmap.h similarity index 100% rename from framebuffer/bitmap.h rename to frontends/framebuffer/bitmap.h diff --git a/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c similarity index 100% rename from framebuffer/clipboard.c rename to frontends/framebuffer/clipboard.c diff --git a/framebuffer/clipboard.h b/frontends/framebuffer/clipboard.h similarity index 100% rename from framebuffer/clipboard.h rename to frontends/framebuffer/clipboard.h diff --git a/framebuffer/convert_font.c b/frontends/framebuffer/convert_font.c similarity index 100% rename from framebuffer/convert_font.c rename to frontends/framebuffer/convert_font.c diff --git a/framebuffer/convert_image.c b/frontends/framebuffer/convert_image.c similarity index 100% rename from framebuffer/convert_image.c rename to frontends/framebuffer/convert_image.c diff --git a/framebuffer/fb_search.c b/frontends/framebuffer/fb_search.c similarity index 100% rename from framebuffer/fb_search.c rename to frontends/framebuffer/fb_search.c diff --git a/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h similarity index 100% rename from framebuffer/fbtk.h rename to frontends/framebuffer/fbtk.h diff --git a/framebuffer/fbtk/bitmap.c b/frontends/framebuffer/fbtk/bitmap.c similarity index 100% rename from framebuffer/fbtk/bitmap.c rename to frontends/framebuffer/fbtk/bitmap.c diff --git a/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c similarity index 100% rename from framebuffer/fbtk/event.c rename to frontends/framebuffer/fbtk/event.c diff --git a/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c similarity index 100% rename from framebuffer/fbtk/fbtk.c rename to frontends/framebuffer/fbtk/fbtk.c diff --git a/framebuffer/fbtk/fill.c b/frontends/framebuffer/fbtk/fill.c similarity index 100% rename from framebuffer/fbtk/fill.c rename to frontends/framebuffer/fbtk/fill.c diff --git a/framebuffer/fbtk/osk.c b/frontends/framebuffer/fbtk/osk.c similarity index 100% rename from framebuffer/fbtk/osk.c rename to frontends/framebuffer/fbtk/osk.c diff --git a/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c similarity index 100% rename from framebuffer/fbtk/scroll.c rename to frontends/framebuffer/fbtk/scroll.c diff --git a/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c similarity index 100% rename from framebuffer/fbtk/text.c rename to frontends/framebuffer/fbtk/text.c diff --git a/framebuffer/fbtk/user.c b/frontends/framebuffer/fbtk/user.c similarity index 100% rename from framebuffer/fbtk/user.c rename to frontends/framebuffer/fbtk/user.c diff --git a/framebuffer/fbtk/widget.h b/frontends/framebuffer/fbtk/widget.h similarity index 100% rename from framebuffer/fbtk/widget.h rename to frontends/framebuffer/fbtk/widget.h diff --git a/framebuffer/fbtk/window.c b/frontends/framebuffer/fbtk/window.c similarity index 100% rename from framebuffer/fbtk/window.c rename to frontends/framebuffer/fbtk/window.c diff --git a/framebuffer/fetch.c b/frontends/framebuffer/fetch.c similarity index 100% rename from framebuffer/fetch.c rename to frontends/framebuffer/fetch.c diff --git a/framebuffer/fetch.h b/frontends/framebuffer/fetch.h similarity index 100% rename from framebuffer/fetch.h rename to frontends/framebuffer/fetch.h diff --git a/framebuffer/findfile.c b/frontends/framebuffer/findfile.c similarity index 100% rename from framebuffer/findfile.c rename to frontends/framebuffer/findfile.c diff --git a/framebuffer/findfile.h b/frontends/framebuffer/findfile.h similarity index 100% rename from framebuffer/findfile.h rename to frontends/framebuffer/findfile.h diff --git a/framebuffer/font.h b/frontends/framebuffer/font.h similarity index 100% rename from framebuffer/font.h rename to frontends/framebuffer/font.h diff --git a/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c similarity index 100% rename from framebuffer/font_freetype.c rename to frontends/framebuffer/font_freetype.c diff --git a/framebuffer/font_freetype.h b/frontends/framebuffer/font_freetype.h similarity index 100% rename from framebuffer/font_freetype.h rename to frontends/framebuffer/font_freetype.h diff --git a/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c similarity index 100% rename from framebuffer/font_internal.c rename to frontends/framebuffer/font_internal.c diff --git a/framebuffer/font_internal.h b/frontends/framebuffer/font_internal.h similarity index 100% rename from framebuffer/font_internal.h rename to frontends/framebuffer/font_internal.h diff --git a/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c similarity index 100% rename from framebuffer/framebuffer.c rename to frontends/framebuffer/framebuffer.c diff --git a/framebuffer/framebuffer.h b/frontends/framebuffer/framebuffer.h similarity index 100% rename from framebuffer/framebuffer.h rename to frontends/framebuffer/framebuffer.h diff --git a/framebuffer/gui.c b/frontends/framebuffer/gui.c similarity index 100% rename from framebuffer/gui.c rename to frontends/framebuffer/gui.c diff --git a/framebuffer/gui.h b/frontends/framebuffer/gui.h similarity index 100% rename from framebuffer/gui.h rename to frontends/framebuffer/gui.h diff --git a/framebuffer/image_data.h b/frontends/framebuffer/image_data.h similarity index 100% rename from framebuffer/image_data.h rename to frontends/framebuffer/image_data.h diff --git a/framebuffer/localhistory.c b/frontends/framebuffer/localhistory.c similarity index 100% rename from framebuffer/localhistory.c rename to frontends/framebuffer/localhistory.c diff --git a/framebuffer/options.h b/frontends/framebuffer/options.h similarity index 100% rename from framebuffer/options.h rename to frontends/framebuffer/options.h diff --git a/cocoa/res/en.lproj/Messages b/frontends/framebuffer/res/Messages similarity index 100% rename from cocoa/res/en.lproj/Messages rename to frontends/framebuffer/res/Messages diff --git a/frontends/framebuffer/res/adblock.css b/frontends/framebuffer/res/adblock.css new file mode 120000 index 000000000..ff2485622 --- /dev/null +++ b/frontends/framebuffer/res/adblock.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/gtk/res/en/credits.html b/frontends/framebuffer/res/credits.html similarity index 100% rename from gtk/res/en/credits.html rename to frontends/framebuffer/res/credits.html diff --git a/frontends/framebuffer/res/default.css b/frontends/framebuffer/res/default.css new file mode 120000 index 000000000..a8579eb7c --- /dev/null +++ b/frontends/framebuffer/res/default.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/frontends/framebuffer/res/favicon.png b/frontends/framebuffer/res/favicon.png new file mode 120000 index 000000000..5a8b3433c --- /dev/null +++ b/frontends/framebuffer/res/favicon.png @@ -0,0 +1 @@ +../../../resources/favicon.png \ No newline at end of file diff --git a/framebuffer/res/fonts/glyph_data b/frontends/framebuffer/res/fonts/glyph_data similarity index 100% rename from framebuffer/res/fonts/glyph_data rename to frontends/framebuffer/res/fonts/glyph_data diff --git a/framebuffer/res/icons/back.png b/frontends/framebuffer/res/icons/back.png similarity index 100% rename from framebuffer/res/icons/back.png rename to frontends/framebuffer/res/icons/back.png diff --git a/framebuffer/res/icons/back_g.png b/frontends/framebuffer/res/icons/back_g.png similarity index 100% rename from framebuffer/res/icons/back_g.png rename to frontends/framebuffer/res/icons/back_g.png diff --git a/framebuffer/res/icons/forward.png b/frontends/framebuffer/res/icons/forward.png similarity index 100% rename from framebuffer/res/icons/forward.png rename to frontends/framebuffer/res/icons/forward.png diff --git a/framebuffer/res/icons/forward_g.png b/frontends/framebuffer/res/icons/forward_g.png similarity index 100% rename from framebuffer/res/icons/forward_g.png rename to frontends/framebuffer/res/icons/forward_g.png diff --git a/framebuffer/res/icons/history.png b/frontends/framebuffer/res/icons/history.png similarity index 100% rename from framebuffer/res/icons/history.png rename to frontends/framebuffer/res/icons/history.png diff --git a/framebuffer/res/icons/history_g.png b/frontends/framebuffer/res/icons/history_g.png similarity index 100% rename from framebuffer/res/icons/history_g.png rename to frontends/framebuffer/res/icons/history_g.png diff --git a/framebuffer/res/icons/home.png b/frontends/framebuffer/res/icons/home.png similarity index 100% rename from framebuffer/res/icons/home.png rename to frontends/framebuffer/res/icons/home.png diff --git a/framebuffer/res/icons/home_g.png b/frontends/framebuffer/res/icons/home_g.png similarity index 100% rename from framebuffer/res/icons/home_g.png rename to frontends/framebuffer/res/icons/home_g.png diff --git a/framebuffer/res/icons/osk.png b/frontends/framebuffer/res/icons/osk.png similarity index 100% rename from framebuffer/res/icons/osk.png rename to frontends/framebuffer/res/icons/osk.png diff --git a/framebuffer/res/icons/reload.png b/frontends/framebuffer/res/icons/reload.png similarity index 100% rename from framebuffer/res/icons/reload.png rename to frontends/framebuffer/res/icons/reload.png diff --git a/framebuffer/res/icons/reload_g.png b/frontends/framebuffer/res/icons/reload_g.png similarity index 100% rename from framebuffer/res/icons/reload_g.png rename to frontends/framebuffer/res/icons/reload_g.png diff --git a/framebuffer/res/icons/scrolld.png b/frontends/framebuffer/res/icons/scrolld.png similarity index 100% rename from framebuffer/res/icons/scrolld.png rename to frontends/framebuffer/res/icons/scrolld.png diff --git a/framebuffer/res/icons/scrolll.png b/frontends/framebuffer/res/icons/scrolll.png similarity index 100% rename from framebuffer/res/icons/scrolll.png rename to frontends/framebuffer/res/icons/scrolll.png diff --git a/framebuffer/res/icons/scrollr.png b/frontends/framebuffer/res/icons/scrollr.png similarity index 100% rename from framebuffer/res/icons/scrollr.png rename to frontends/framebuffer/res/icons/scrollr.png diff --git a/framebuffer/res/icons/scrollu.png b/frontends/framebuffer/res/icons/scrollu.png similarity index 100% rename from framebuffer/res/icons/scrollu.png rename to frontends/framebuffer/res/icons/scrollu.png diff --git a/framebuffer/res/icons/stop.png b/frontends/framebuffer/res/icons/stop.png similarity index 100% rename from framebuffer/res/icons/stop.png rename to frontends/framebuffer/res/icons/stop.png diff --git a/framebuffer/res/icons/stop_g.png b/frontends/framebuffer/res/icons/stop_g.png similarity index 100% rename from framebuffer/res/icons/stop_g.png rename to frontends/framebuffer/res/icons/stop_g.png diff --git a/frontends/framebuffer/res/internal.css b/frontends/framebuffer/res/internal.css new file mode 120000 index 000000000..17f9f1504 --- /dev/null +++ b/frontends/framebuffer/res/internal.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/gtk/res/en/licence.html b/frontends/framebuffer/res/licence.html similarity index 100% rename from gtk/res/en/licence.html rename to frontends/framebuffer/res/licence.html diff --git a/gtk/res/en/welcome.html b/frontends/framebuffer/res/maps.html similarity index 100% rename from gtk/res/en/welcome.html rename to frontends/framebuffer/res/maps.html diff --git a/frontends/framebuffer/res/netsurf.png b/frontends/framebuffer/res/netsurf.png new file mode 120000 index 000000000..905512c25 --- /dev/null +++ b/frontends/framebuffer/res/netsurf.png @@ -0,0 +1 @@ +../../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/framebuffer/res/pointers/caret.png b/frontends/framebuffer/res/pointers/caret.png similarity index 100% rename from framebuffer/res/pointers/caret.png rename to frontends/framebuffer/res/pointers/caret.png diff --git a/framebuffer/res/pointers/cross.png b/frontends/framebuffer/res/pointers/cross.png similarity index 100% rename from framebuffer/res/pointers/cross.png rename to frontends/framebuffer/res/pointers/cross.png diff --git a/framebuffer/res/pointers/default.png b/frontends/framebuffer/res/pointers/default.png similarity index 100% rename from framebuffer/res/pointers/default.png rename to frontends/framebuffer/res/pointers/default.png diff --git a/framebuffer/res/pointers/help.png b/frontends/framebuffer/res/pointers/help.png similarity index 100% rename from framebuffer/res/pointers/help.png rename to frontends/framebuffer/res/pointers/help.png diff --git a/framebuffer/res/pointers/left-right.png b/frontends/framebuffer/res/pointers/left-right.png similarity index 100% rename from framebuffer/res/pointers/left-right.png rename to frontends/framebuffer/res/pointers/left-right.png diff --git a/framebuffer/res/pointers/lu-rd.png b/frontends/framebuffer/res/pointers/lu-rd.png similarity index 100% rename from framebuffer/res/pointers/lu-rd.png rename to frontends/framebuffer/res/pointers/lu-rd.png diff --git a/framebuffer/res/pointers/menu.png b/frontends/framebuffer/res/pointers/menu.png similarity index 100% rename from framebuffer/res/pointers/menu.png rename to frontends/framebuffer/res/pointers/menu.png diff --git a/framebuffer/res/pointers/move.png b/frontends/framebuffer/res/pointers/move.png similarity index 100% rename from framebuffer/res/pointers/move.png rename to frontends/framebuffer/res/pointers/move.png diff --git a/framebuffer/res/pointers/no_drop.png b/frontends/framebuffer/res/pointers/no_drop.png similarity index 100% rename from framebuffer/res/pointers/no_drop.png rename to frontends/framebuffer/res/pointers/no_drop.png diff --git a/framebuffer/res/pointers/not_allowed.png b/frontends/framebuffer/res/pointers/not_allowed.png similarity index 100% rename from framebuffer/res/pointers/not_allowed.png rename to frontends/framebuffer/res/pointers/not_allowed.png diff --git a/framebuffer/res/pointers/point.png b/frontends/framebuffer/res/pointers/point.png similarity index 100% rename from framebuffer/res/pointers/point.png rename to frontends/framebuffer/res/pointers/point.png diff --git a/framebuffer/res/pointers/progress.png b/frontends/framebuffer/res/pointers/progress.png similarity index 100% rename from framebuffer/res/pointers/progress.png rename to frontends/framebuffer/res/pointers/progress.png diff --git a/framebuffer/res/pointers/ru-ld.png b/frontends/framebuffer/res/pointers/ru-ld.png similarity index 100% rename from framebuffer/res/pointers/ru-ld.png rename to frontends/framebuffer/res/pointers/ru-ld.png diff --git a/framebuffer/res/pointers/up-down.png b/frontends/framebuffer/res/pointers/up-down.png similarity index 100% rename from framebuffer/res/pointers/up-down.png rename to frontends/framebuffer/res/pointers/up-down.png diff --git a/framebuffer/res/pointers/wait.png b/frontends/framebuffer/res/pointers/wait.png similarity index 100% rename from framebuffer/res/pointers/wait.png rename to frontends/framebuffer/res/pointers/wait.png diff --git a/frontends/framebuffer/res/quirks.css b/frontends/framebuffer/res/quirks.css new file mode 120000 index 000000000..88aabe48c --- /dev/null +++ b/frontends/framebuffer/res/quirks.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/framebuffer/res/throbber b/frontends/framebuffer/res/throbber similarity index 100% rename from framebuffer/res/throbber rename to frontends/framebuffer/res/throbber diff --git a/frontends/framebuffer/res/welcome.html b/frontends/framebuffer/res/welcome.html new file mode 120000 index 000000000..28362130a --- /dev/null +++ b/frontends/framebuffer/res/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file diff --git a/framebuffer/schedule.c b/frontends/framebuffer/schedule.c similarity index 100% rename from framebuffer/schedule.c rename to frontends/framebuffer/schedule.c diff --git a/framebuffer/schedule.h b/frontends/framebuffer/schedule.h similarity index 100% rename from framebuffer/schedule.h rename to frontends/framebuffer/schedule.h diff --git a/gtk/Makefile.target b/frontends/gtk/Makefile similarity index 80% rename from gtk/Makefile.target rename to frontends/gtk/Makefile index e450135b2..7f8ffc16a 100644 --- a/gtk/Makefile.target +++ b/frontends/gtk/Makefile @@ -9,25 +9,9 @@ # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG -NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG -NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG -NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 -NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO -# add a line similar to below for each optional lib here -# note: webp lacks pkg-config file -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG)) -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) $(eval $(call pkg_config_find_and_add_enabled,RSVG,librsvg-2.0,SVG)) -$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) -$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) -$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) $(eval $(call pkg_config_find_and_add_enabled,VIDEO,gstreamer-0.10,Video)) # GTK and GLIB flags to disable depricated usage @@ -59,8 +43,6 @@ GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk -g \ -DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" # non optional pkg-configed libs -$(eval $(call pkg_config_find_and_add,openssl,OpenSSL)) -$(eval $(call pkg_config_find_and_add,libcurl,Curl )) $(eval $(call pkg_config_find_and_add,gtk+-$(NETSURF_GTK_MAJOR).0,GTK-$(NETSURF_GTK_MAJOR))) $(eval $(call pkg_config_find_and_add,gthread-2.0,GThread2)) $(eval $(call pkg_config_find_and_add,gmodule-2.0,GModule2)) @@ -73,12 +55,15 @@ LDFLAGS += -lm # Target setup # --------------------------------------------------------------------------- +# Path to GTK resources +NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR) + # The gtk binary target EXETARGET := nsgtk # The filter and target for split messages MESSAGES_FILTER=gtk -MESSAGES_TARGET=gtk/res +MESSAGES_TARGET=$(NSGTK_RESOURCES_DIR) # --------------------------------------------------------------------------- # Windows flag setup @@ -95,9 +80,6 @@ endif # builtin resource sources S_RESOURCE := -# Path to GTK resources -NSGTK_RESOURCES_DIR := gtk/res - # Glib prior to 2.32 does not have GResource handling. # # This uses pkg-config to check for the minimum required version for @@ -175,20 +157,18 @@ endif # Source file setup # ---------------------------------------------------------------------------- -# S_GTK are sources purely for the GTK build -S_GTK := gui.c schedule.c layout_pango.c bitmap.c plotters.c \ +# S_FRONTEND are sources purely for the GTK frontend +S_FRONTEND := gui.c schedule.c layout_pango.c bitmap.c plotters.c \ treeview.c scaffolding.c gdk.c completion.c login.c throbber.c \ selection.c history.c window.c fetch.c download.c menu.c \ print.c search.c tabs.c toolbar.c gettext.c \ compat.c cookies.c hotlist.c viewdata.c viewsource.c \ preferences.c about.c ssl_cert.c resources.c -S_GTK := $(addprefix gtk/,$(S_GTK)) - # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RESOURCE) $(S_GTK) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RESOURCE) $(S_FRONTEND) # ---------------------------------------------------------------------------- # Install target @@ -202,8 +182,8 @@ GTK_RESOURCES_LIST := \ arrow_down_8x32.png GTK_RESOURCES_LIST := \ - $(addprefix gtk/res/, $(GTK_RESOURCES_LIST)) \ - $(wildcard gtk/res/*.gtk$(NETSURF_GTK_MAJOR).ui) + $(addprefix $(NSGTK_RESOURCES_DIR)/, $(GTK_RESOURCES_LIST)) \ + $(wildcard $(NSGTK_RESOURCES_DIR)/*.gtk$(NETSURF_GTK_MAJOR).ui) # translations with more than just Messages files GTK_TRANSLATIONS_HTML := de en fr it ja nl @@ -212,10 +192,10 @@ install-gtk: $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN) $(Q)install nsgtk $(DESTDIR)$(NETSURF_GTK_BIN)netsurf $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)icons - $(Q)install -m 0644 gtk/res/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons + $(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/icons/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/icons $(Q)mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber - $(Q)install -m 0644 gtk/res/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber - $(Q)tar -c -h -C gtk/res -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f - + $(Q)install -m 0644 $(NSGTK_RESOURCES_DIR)/throbber/*.png $(DESTDIR)$(NETSURF_GTK_RESOURCES)/throbber + $(Q)tar -c -h -C $(NSGTK_RESOURCES_DIR) -f - $(GTK_TRANSLATIONS_HTML) | tar -xv -C $(DESTDIR)$(NETSURF_GTK_RESOURCES) -f - $(Q)install -m 0644 $(GTK_RESOURCES_LIST) $(DESTDIR)$(NETSURF_GTK_RESOURCES) # ---------------------------------------------------------------------------- diff --git a/gtk/Makefile.defaults b/frontends/gtk/Makefile.defaults similarity index 94% rename from gtk/Makefile.defaults rename to frontends/gtk/Makefile.defaults index d97bc2323..fc352a020 100644 --- a/gtk/Makefile.defaults +++ b/frontends/gtk/Makefile.defaults @@ -4,7 +4,7 @@ # Where to search for NetSurf's resources after looking in ~/.netsurf and # $NETSURFRES. It must have a trailing / -NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/:./gtk/res/ +NETSURF_GTK_RESOURCES := $(PREFIX)/share/netsurf/:./frontends/gtk/res/ # Where to install the netsurf binary NETSURF_GTK_BIN := $(PREFIX)/bin/ diff --git a/gtk/about.c b/frontends/gtk/about.c similarity index 100% rename from gtk/about.c rename to frontends/gtk/about.c diff --git a/gtk/about.h b/frontends/gtk/about.h similarity index 100% rename from gtk/about.h rename to frontends/gtk/about.h diff --git a/gtk/bitmap.c b/frontends/gtk/bitmap.c similarity index 100% rename from gtk/bitmap.c rename to frontends/gtk/bitmap.c diff --git a/gtk/bitmap.h b/frontends/gtk/bitmap.h similarity index 100% rename from gtk/bitmap.h rename to frontends/gtk/bitmap.h diff --git a/gtk/compat.c b/frontends/gtk/compat.c similarity index 100% rename from gtk/compat.c rename to frontends/gtk/compat.c diff --git a/gtk/compat.h b/frontends/gtk/compat.h similarity index 100% rename from gtk/compat.h rename to frontends/gtk/compat.h diff --git a/gtk/completion.c b/frontends/gtk/completion.c similarity index 100% rename from gtk/completion.c rename to frontends/gtk/completion.c diff --git a/gtk/completion.h b/frontends/gtk/completion.h similarity index 100% rename from gtk/completion.h rename to frontends/gtk/completion.h diff --git a/gtk/cookies.c b/frontends/gtk/cookies.c similarity index 100% rename from gtk/cookies.c rename to frontends/gtk/cookies.c diff --git a/gtk/cookies.h b/frontends/gtk/cookies.h similarity index 100% rename from gtk/cookies.h rename to frontends/gtk/cookies.h diff --git a/gtk/download.c b/frontends/gtk/download.c similarity index 100% rename from gtk/download.c rename to frontends/gtk/download.c diff --git a/gtk/download.h b/frontends/gtk/download.h similarity index 100% rename from gtk/download.h rename to frontends/gtk/download.h diff --git a/gtk/fetch.c b/frontends/gtk/fetch.c similarity index 100% rename from gtk/fetch.c rename to frontends/gtk/fetch.c diff --git a/gtk/fetch.h b/frontends/gtk/fetch.h similarity index 100% rename from gtk/fetch.h rename to frontends/gtk/fetch.h diff --git a/gtk/gdk.c b/frontends/gtk/gdk.c similarity index 100% rename from gtk/gdk.c rename to frontends/gtk/gdk.c diff --git a/gtk/gdk.h b/frontends/gtk/gdk.h similarity index 100% rename from gtk/gdk.h rename to frontends/gtk/gdk.h diff --git a/gtk/gettext.c b/frontends/gtk/gettext.c similarity index 100% rename from gtk/gettext.c rename to frontends/gtk/gettext.c diff --git a/gtk/gettext.h b/frontends/gtk/gettext.h similarity index 100% rename from gtk/gettext.h rename to frontends/gtk/gettext.h diff --git a/gtk/gui.c b/frontends/gtk/gui.c similarity index 100% rename from gtk/gui.c rename to frontends/gtk/gui.c diff --git a/gtk/gui.h b/frontends/gtk/gui.h similarity index 100% rename from gtk/gui.h rename to frontends/gtk/gui.h diff --git a/gtk/history.c b/frontends/gtk/history.c similarity index 100% rename from gtk/history.c rename to frontends/gtk/history.c diff --git a/gtk/history.h b/frontends/gtk/history.h similarity index 100% rename from gtk/history.h rename to frontends/gtk/history.h diff --git a/gtk/hotlist.c b/frontends/gtk/hotlist.c similarity index 100% rename from gtk/hotlist.c rename to frontends/gtk/hotlist.c diff --git a/gtk/hotlist.h b/frontends/gtk/hotlist.h similarity index 100% rename from gtk/hotlist.h rename to frontends/gtk/hotlist.h diff --git a/gtk/layout_pango.c b/frontends/gtk/layout_pango.c similarity index 100% rename from gtk/layout_pango.c rename to frontends/gtk/layout_pango.c diff --git a/gtk/layout_pango.h b/frontends/gtk/layout_pango.h similarity index 100% rename from gtk/layout_pango.h rename to frontends/gtk/layout_pango.h diff --git a/gtk/login.c b/frontends/gtk/login.c similarity index 100% rename from gtk/login.c rename to frontends/gtk/login.c diff --git a/gtk/login.h b/frontends/gtk/login.h similarity index 100% rename from gtk/login.h rename to frontends/gtk/login.h diff --git a/gtk/menu.c b/frontends/gtk/menu.c similarity index 100% rename from gtk/menu.c rename to frontends/gtk/menu.c diff --git a/gtk/menu.h b/frontends/gtk/menu.h similarity index 100% rename from gtk/menu.h rename to frontends/gtk/menu.h diff --git a/gtk/options.h b/frontends/gtk/options.h similarity index 100% rename from gtk/options.h rename to frontends/gtk/options.h diff --git a/gtk/plotters.c b/frontends/gtk/plotters.c similarity index 100% rename from gtk/plotters.c rename to frontends/gtk/plotters.c diff --git a/gtk/plotters.h b/frontends/gtk/plotters.h similarity index 100% rename from gtk/plotters.h rename to frontends/gtk/plotters.h diff --git a/gtk/preferences.c b/frontends/gtk/preferences.c similarity index 100% rename from gtk/preferences.c rename to frontends/gtk/preferences.c diff --git a/gtk/preferences.h b/frontends/gtk/preferences.h similarity index 100% rename from gtk/preferences.h rename to frontends/gtk/preferences.h diff --git a/gtk/print.c b/frontends/gtk/print.c similarity index 100% rename from gtk/print.c rename to frontends/gtk/print.c diff --git a/gtk/print.h b/frontends/gtk/print.h similarity index 100% rename from gtk/print.h rename to frontends/gtk/print.h diff --git a/gtk/res/Messages b/frontends/gtk/res/Messages similarity index 100% rename from gtk/res/Messages rename to frontends/gtk/res/Messages diff --git a/frontends/gtk/res/SearchEngines b/frontends/gtk/res/SearchEngines new file mode 120000 index 000000000..3dc819c2a --- /dev/null +++ b/frontends/gtk/res/SearchEngines @@ -0,0 +1 @@ +../../../resources/SearchEngines \ No newline at end of file diff --git a/frontends/gtk/res/adblock.css b/frontends/gtk/res/adblock.css new file mode 120000 index 000000000..ff2485622 --- /dev/null +++ b/frontends/gtk/res/adblock.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/gtk/res/arrow_down_8x32.png b/frontends/gtk/res/arrow_down_8x32.png similarity index 100% rename from gtk/res/arrow_down_8x32.png rename to frontends/gtk/res/arrow_down_8x32.png diff --git a/frontends/gtk/res/ca-bundle.txt b/frontends/gtk/res/ca-bundle.txt new file mode 120000 index 000000000..0b0e416ad --- /dev/null +++ b/frontends/gtk/res/ca-bundle.txt @@ -0,0 +1 @@ +../../../!NetSurf/Resources/ca-bundle \ No newline at end of file diff --git a/gtk/res/cookies.gtk2.ui b/frontends/gtk/res/cookies.gtk2.ui similarity index 100% rename from gtk/res/cookies.gtk2.ui rename to frontends/gtk/res/cookies.gtk2.ui diff --git a/gtk/res/cookies.gtk3.ui b/frontends/gtk/res/cookies.gtk3.ui similarity index 100% rename from gtk/res/cookies.gtk3.ui rename to frontends/gtk/res/cookies.gtk3.ui diff --git a/gtk/res/credits.html b/frontends/gtk/res/credits.html similarity index 100% rename from gtk/res/credits.html rename to frontends/gtk/res/credits.html diff --git a/frontends/gtk/res/de/welcome.html b/frontends/gtk/res/de/welcome.html new file mode 120000 index 000000000..98a53b215 --- /dev/null +++ b/frontends/gtk/res/de/welcome.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/de/welcome.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/default.css b/frontends/gtk/res/default.css new file mode 120000 index 000000000..a8579eb7c --- /dev/null +++ b/frontends/gtk/res/default.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/gtk/res/default.ico b/frontends/gtk/res/default.ico similarity index 100% rename from gtk/res/default.ico rename to frontends/gtk/res/default.ico diff --git a/gtk/res/downloads.gtk2.ui b/frontends/gtk/res/downloads.gtk2.ui similarity index 100% rename from gtk/res/downloads.gtk2.ui rename to frontends/gtk/res/downloads.gtk2.ui diff --git a/gtk/res/downloads.gtk3.ui b/frontends/gtk/res/downloads.gtk3.ui similarity index 100% rename from gtk/res/downloads.gtk3.ui rename to frontends/gtk/res/downloads.gtk3.ui diff --git a/frontends/gtk/res/en/credits.html b/frontends/gtk/res/en/credits.html new file mode 120000 index 000000000..252516fd7 --- /dev/null +++ b/frontends/gtk/res/en/credits.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/en/credits.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/en/licence.html b/frontends/gtk/res/en/licence.html new file mode 120000 index 000000000..79f73669b --- /dev/null +++ b/frontends/gtk/res/en/licence.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/en/licence.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/en/maps.html b/frontends/gtk/res/en/maps.html new file mode 120000 index 000000000..bb3ffcbe7 --- /dev/null +++ b/frontends/gtk/res/en/maps.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/en/maps.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/en/welcome.html b/frontends/gtk/res/en/welcome.html new file mode 120000 index 000000000..601099223 --- /dev/null +++ b/frontends/gtk/res/en/welcome.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/favicon.png b/frontends/gtk/res/favicon.png new file mode 120000 index 000000000..5a8b3433c --- /dev/null +++ b/frontends/gtk/res/favicon.png @@ -0,0 +1 @@ +../../../resources/favicon.png \ No newline at end of file diff --git a/gtk/res/history.gtk2.ui b/frontends/gtk/res/history.gtk2.ui similarity index 100% rename from gtk/res/history.gtk2.ui rename to frontends/gtk/res/history.gtk2.ui diff --git a/gtk/res/history.gtk3.ui b/frontends/gtk/res/history.gtk3.ui similarity index 100% rename from gtk/res/history.gtk3.ui rename to frontends/gtk/res/history.gtk3.ui diff --git a/gtk/res/hotlist.gtk2.ui b/frontends/gtk/res/hotlist.gtk2.ui similarity index 100% rename from gtk/res/hotlist.gtk2.ui rename to frontends/gtk/res/hotlist.gtk2.ui diff --git a/gtk/res/hotlist.gtk3.ui b/frontends/gtk/res/hotlist.gtk3.ui similarity index 100% rename from gtk/res/hotlist.gtk3.ui rename to frontends/gtk/res/hotlist.gtk3.ui diff --git a/frontends/gtk/res/icons b/frontends/gtk/res/icons new file mode 120000 index 000000000..187efd6f9 --- /dev/null +++ b/frontends/gtk/res/icons @@ -0,0 +1 @@ +../../../!NetSurf/Resources/Icons/ \ No newline at end of file diff --git a/frontends/gtk/res/internal.css b/frontends/gtk/res/internal.css new file mode 120000 index 000000000..17f9f1504 --- /dev/null +++ b/frontends/gtk/res/internal.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/frontends/gtk/res/it/credits.html b/frontends/gtk/res/it/credits.html new file mode 120000 index 000000000..64b78982e --- /dev/null +++ b/frontends/gtk/res/it/credits.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/it/credits.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/it/licence.html b/frontends/gtk/res/it/licence.html new file mode 120000 index 000000000..4abc825d3 --- /dev/null +++ b/frontends/gtk/res/it/licence.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/it/licence.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/it/welcome.html b/frontends/gtk/res/it/welcome.html new file mode 120000 index 000000000..59cef0551 --- /dev/null +++ b/frontends/gtk/res/it/welcome.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/it/welcome.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/ja/welcome.html b/frontends/gtk/res/ja/welcome.html new file mode 120000 index 000000000..a2556ee4e --- /dev/null +++ b/frontends/gtk/res/ja/welcome.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/ja/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/languages b/frontends/gtk/res/languages similarity index 100% rename from gtk/res/languages rename to frontends/gtk/res/languages diff --git a/gtk/res/licence.html b/frontends/gtk/res/licence.html similarity index 100% rename from gtk/res/licence.html rename to frontends/gtk/res/licence.html diff --git a/gtk/res/login.gtk2.ui b/frontends/gtk/res/login.gtk2.ui similarity index 100% rename from gtk/res/login.gtk2.ui rename to frontends/gtk/res/login.gtk2.ui diff --git a/gtk/res/login.gtk3.ui b/frontends/gtk/res/login.gtk3.ui similarity index 100% rename from gtk/res/login.gtk3.ui rename to frontends/gtk/res/login.gtk3.ui diff --git a/gtk/res/maps.html b/frontends/gtk/res/maps.html similarity index 100% rename from gtk/res/maps.html rename to frontends/gtk/res/maps.html diff --git a/gtk/res/menu_cursor.png b/frontends/gtk/res/menu_cursor.png similarity index 100% rename from gtk/res/menu_cursor.png rename to frontends/gtk/res/menu_cursor.png diff --git a/gtk/res/menu_cursor.xbm b/frontends/gtk/res/menu_cursor.xbm similarity index 100% rename from gtk/res/menu_cursor.xbm rename to frontends/gtk/res/menu_cursor.xbm diff --git a/gtk/res/menu_cursor_mask.xbm b/frontends/gtk/res/menu_cursor_mask.xbm similarity index 100% rename from gtk/res/menu_cursor_mask.xbm rename to frontends/gtk/res/menu_cursor_mask.xbm diff --git a/gtk/res/menu_cursor_mask.xpm b/frontends/gtk/res/menu_cursor_mask.xpm similarity index 100% rename from gtk/res/menu_cursor_mask.xpm rename to frontends/gtk/res/menu_cursor_mask.xpm diff --git a/gtk/res/messages.gresource.xml b/frontends/gtk/res/messages.gresource.xml similarity index 100% rename from gtk/res/messages.gresource.xml rename to frontends/gtk/res/messages.gresource.xml diff --git a/gtk/res/netsurf-16x16.xpm b/frontends/gtk/res/netsurf-16x16.xpm similarity index 100% rename from gtk/res/netsurf-16x16.xpm rename to frontends/gtk/res/netsurf-16x16.xpm diff --git a/gtk/res/netsurf-gtk.desktop b/frontends/gtk/res/netsurf-gtk.desktop similarity index 100% rename from gtk/res/netsurf-gtk.desktop rename to frontends/gtk/res/netsurf-gtk.desktop diff --git a/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml similarity index 100% rename from gtk/res/netsurf.gresource.xml rename to frontends/gtk/res/netsurf.gresource.xml diff --git a/gtk/res/netsurf.gtk2.ui b/frontends/gtk/res/netsurf.gtk2.ui similarity index 100% rename from gtk/res/netsurf.gtk2.ui rename to frontends/gtk/res/netsurf.gtk2.ui diff --git a/gtk/res/netsurf.gtk3.ui b/frontends/gtk/res/netsurf.gtk3.ui similarity index 100% rename from gtk/res/netsurf.gtk3.ui rename to frontends/gtk/res/netsurf.gtk3.ui diff --git a/frontends/gtk/res/netsurf.png b/frontends/gtk/res/netsurf.png new file mode 120000 index 000000000..905512c25 --- /dev/null +++ b/frontends/gtk/res/netsurf.png @@ -0,0 +1 @@ +../../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/gtk/res/netsurf.xpm b/frontends/gtk/res/netsurf.xpm similarity index 100% rename from gtk/res/netsurf.xpm rename to frontends/gtk/res/netsurf.xpm diff --git a/frontends/gtk/res/nl/credits.html b/frontends/gtk/res/nl/credits.html new file mode 120000 index 000000000..9c983987a --- /dev/null +++ b/frontends/gtk/res/nl/credits.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/nl/credits.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/nl/licence.html b/frontends/gtk/res/nl/licence.html new file mode 120000 index 000000000..8a10d2073 --- /dev/null +++ b/frontends/gtk/res/nl/licence.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/nl/licence.html,faf \ No newline at end of file diff --git a/frontends/gtk/res/nl/welcome.html b/frontends/gtk/res/nl/welcome.html new file mode 120000 index 000000000..6b2ba7742 --- /dev/null +++ b/frontends/gtk/res/nl/welcome.html @@ -0,0 +1 @@ +../../../../!NetSurf/Resources/nl/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/options.gtk2.ui b/frontends/gtk/res/options.gtk2.ui similarity index 100% rename from gtk/res/options.gtk2.ui rename to frontends/gtk/res/options.gtk2.ui diff --git a/gtk/res/options.gtk3.ui b/frontends/gtk/res/options.gtk3.ui similarity index 100% rename from gtk/res/options.gtk3.ui rename to frontends/gtk/res/options.gtk3.ui diff --git a/gtk/res/password.gtk2.ui b/frontends/gtk/res/password.gtk2.ui similarity index 100% rename from gtk/res/password.gtk2.ui rename to frontends/gtk/res/password.gtk2.ui diff --git a/gtk/res/password.gtk3.ui b/frontends/gtk/res/password.gtk3.ui similarity index 100% rename from gtk/res/password.gtk3.ui rename to frontends/gtk/res/password.gtk3.ui diff --git a/frontends/gtk/res/quirks.css b/frontends/gtk/res/quirks.css new file mode 120000 index 000000000..88aabe48c --- /dev/null +++ b/frontends/gtk/res/quirks.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/gtk/res/ssl.gtk2.ui b/frontends/gtk/res/ssl.gtk2.ui similarity index 100% rename from gtk/res/ssl.gtk2.ui rename to frontends/gtk/res/ssl.gtk2.ui diff --git a/gtk/res/ssl.gtk3.ui b/frontends/gtk/res/ssl.gtk3.ui similarity index 100% rename from gtk/res/ssl.gtk3.ui rename to frontends/gtk/res/ssl.gtk3.ui diff --git a/gtk/res/tabcontents.gtk2.ui b/frontends/gtk/res/tabcontents.gtk2.ui similarity index 100% rename from gtk/res/tabcontents.gtk2.ui rename to frontends/gtk/res/tabcontents.gtk2.ui diff --git a/gtk/res/tabcontents.gtk3.ui b/frontends/gtk/res/tabcontents.gtk3.ui similarity index 100% rename from gtk/res/tabcontents.gtk3.ui rename to frontends/gtk/res/tabcontents.gtk3.ui diff --git a/gtk/res/throbber/throbber0.png b/frontends/gtk/res/throbber/throbber0.png similarity index 100% rename from gtk/res/throbber/throbber0.png rename to frontends/gtk/res/throbber/throbber0.png diff --git a/gtk/res/throbber/throbber1.png b/frontends/gtk/res/throbber/throbber1.png similarity index 100% rename from gtk/res/throbber/throbber1.png rename to frontends/gtk/res/throbber/throbber1.png diff --git a/gtk/res/throbber/throbber2.png b/frontends/gtk/res/throbber/throbber2.png similarity index 100% rename from gtk/res/throbber/throbber2.png rename to frontends/gtk/res/throbber/throbber2.png diff --git a/gtk/res/throbber/throbber3.png b/frontends/gtk/res/throbber/throbber3.png similarity index 100% rename from gtk/res/throbber/throbber3.png rename to frontends/gtk/res/throbber/throbber3.png diff --git a/gtk/res/throbber/throbber4.png b/frontends/gtk/res/throbber/throbber4.png similarity index 100% rename from gtk/res/throbber/throbber4.png rename to frontends/gtk/res/throbber/throbber4.png diff --git a/gtk/res/throbber/throbber5.png b/frontends/gtk/res/throbber/throbber5.png similarity index 100% rename from gtk/res/throbber/throbber5.png rename to frontends/gtk/res/throbber/throbber5.png diff --git a/gtk/res/throbber/throbber6.png b/frontends/gtk/res/throbber/throbber6.png similarity index 100% rename from gtk/res/throbber/throbber6.png rename to frontends/gtk/res/throbber/throbber6.png diff --git a/gtk/res/throbber/throbber7.png b/frontends/gtk/res/throbber/throbber7.png similarity index 100% rename from gtk/res/throbber/throbber7.png rename to frontends/gtk/res/throbber/throbber7.png diff --git a/gtk/res/throbber/throbber8.png b/frontends/gtk/res/throbber/throbber8.png similarity index 100% rename from gtk/res/throbber/throbber8.png rename to frontends/gtk/res/throbber/throbber8.png diff --git a/gtk/res/toolbar.gtk2.ui b/frontends/gtk/res/toolbar.gtk2.ui similarity index 100% rename from gtk/res/toolbar.gtk2.ui rename to frontends/gtk/res/toolbar.gtk2.ui diff --git a/gtk/res/toolbar.gtk3.ui b/frontends/gtk/res/toolbar.gtk3.ui similarity index 100% rename from gtk/res/toolbar.gtk3.ui rename to frontends/gtk/res/toolbar.gtk3.ui diff --git a/gtk/res/viewdata.gtk2.ui b/frontends/gtk/res/viewdata.gtk2.ui similarity index 100% rename from gtk/res/viewdata.gtk2.ui rename to frontends/gtk/res/viewdata.gtk2.ui diff --git a/gtk/res/viewdata.gtk3.ui b/frontends/gtk/res/viewdata.gtk3.ui similarity index 100% rename from gtk/res/viewdata.gtk3.ui rename to frontends/gtk/res/viewdata.gtk3.ui diff --git a/gtk/res/warning.gtk2.ui b/frontends/gtk/res/warning.gtk2.ui similarity index 100% rename from gtk/res/warning.gtk2.ui rename to frontends/gtk/res/warning.gtk2.ui diff --git a/gtk/res/warning.gtk3.ui b/frontends/gtk/res/warning.gtk3.ui similarity index 100% rename from gtk/res/warning.gtk3.ui rename to frontends/gtk/res/warning.gtk3.ui diff --git a/gtk/res/welcome.html b/frontends/gtk/res/welcome.html similarity index 100% rename from gtk/res/welcome.html rename to frontends/gtk/res/welcome.html diff --git a/gtk/resources.c b/frontends/gtk/resources.c similarity index 100% rename from gtk/resources.c rename to frontends/gtk/resources.c diff --git a/gtk/resources.h b/frontends/gtk/resources.h similarity index 100% rename from gtk/resources.h rename to frontends/gtk/resources.h diff --git a/gtk/scaffolding.c b/frontends/gtk/scaffolding.c similarity index 100% rename from gtk/scaffolding.c rename to frontends/gtk/scaffolding.c diff --git a/gtk/scaffolding.h b/frontends/gtk/scaffolding.h similarity index 100% rename from gtk/scaffolding.h rename to frontends/gtk/scaffolding.h diff --git a/gtk/schedule.c b/frontends/gtk/schedule.c similarity index 100% rename from gtk/schedule.c rename to frontends/gtk/schedule.c diff --git a/gtk/schedule.h b/frontends/gtk/schedule.h similarity index 100% rename from gtk/schedule.h rename to frontends/gtk/schedule.h diff --git a/gtk/search.c b/frontends/gtk/search.c similarity index 100% rename from gtk/search.c rename to frontends/gtk/search.c diff --git a/gtk/search.h b/frontends/gtk/search.h similarity index 100% rename from gtk/search.h rename to frontends/gtk/search.h diff --git a/gtk/selection.c b/frontends/gtk/selection.c similarity index 100% rename from gtk/selection.c rename to frontends/gtk/selection.c diff --git a/gtk/selection.h b/frontends/gtk/selection.h similarity index 100% rename from gtk/selection.h rename to frontends/gtk/selection.h diff --git a/gtk/sexy_icon_entry.c b/frontends/gtk/sexy_icon_entry.c similarity index 100% rename from gtk/sexy_icon_entry.c rename to frontends/gtk/sexy_icon_entry.c diff --git a/gtk/sexy_icon_entry.h b/frontends/gtk/sexy_icon_entry.h similarity index 100% rename from gtk/sexy_icon_entry.h rename to frontends/gtk/sexy_icon_entry.h diff --git a/gtk/ssl_cert.c b/frontends/gtk/ssl_cert.c similarity index 100% rename from gtk/ssl_cert.c rename to frontends/gtk/ssl_cert.c diff --git a/gtk/ssl_cert.h b/frontends/gtk/ssl_cert.h similarity index 100% rename from gtk/ssl_cert.h rename to frontends/gtk/ssl_cert.h diff --git a/gtk/tabs.c b/frontends/gtk/tabs.c similarity index 100% rename from gtk/tabs.c rename to frontends/gtk/tabs.c diff --git a/gtk/tabs.h b/frontends/gtk/tabs.h similarity index 100% rename from gtk/tabs.h rename to frontends/gtk/tabs.h diff --git a/gtk/throbber.c b/frontends/gtk/throbber.c similarity index 100% rename from gtk/throbber.c rename to frontends/gtk/throbber.c diff --git a/gtk/throbber.h b/frontends/gtk/throbber.h similarity index 100% rename from gtk/throbber.h rename to frontends/gtk/throbber.h diff --git a/gtk/toolbar.c b/frontends/gtk/toolbar.c similarity index 100% rename from gtk/toolbar.c rename to frontends/gtk/toolbar.c diff --git a/gtk/toolbar.h b/frontends/gtk/toolbar.h similarity index 100% rename from gtk/toolbar.h rename to frontends/gtk/toolbar.h diff --git a/gtk/treeview.c b/frontends/gtk/treeview.c similarity index 100% rename from gtk/treeview.c rename to frontends/gtk/treeview.c diff --git a/gtk/treeview.h b/frontends/gtk/treeview.h similarity index 100% rename from gtk/treeview.h rename to frontends/gtk/treeview.h diff --git a/gtk/viewdata.c b/frontends/gtk/viewdata.c similarity index 100% rename from gtk/viewdata.c rename to frontends/gtk/viewdata.c diff --git a/gtk/viewdata.h b/frontends/gtk/viewdata.h similarity index 100% rename from gtk/viewdata.h rename to frontends/gtk/viewdata.h diff --git a/gtk/viewsource.c b/frontends/gtk/viewsource.c similarity index 100% rename from gtk/viewsource.c rename to frontends/gtk/viewsource.c diff --git a/gtk/viewsource.h b/frontends/gtk/viewsource.h similarity index 100% rename from gtk/viewsource.h rename to frontends/gtk/viewsource.h diff --git a/gtk/warn.h b/frontends/gtk/warn.h similarity index 100% rename from gtk/warn.h rename to frontends/gtk/warn.h diff --git a/gtk/window.c b/frontends/gtk/window.c similarity index 100% rename from gtk/window.c rename to frontends/gtk/window.c diff --git a/gtk/window.h b/frontends/gtk/window.h similarity index 100% rename from gtk/window.h rename to frontends/gtk/window.h diff --git a/monkey/401login.c b/frontends/monkey/401login.c similarity index 100% rename from monkey/401login.c rename to frontends/monkey/401login.c diff --git a/monkey/401login.h b/frontends/monkey/401login.h similarity index 100% rename from monkey/401login.h rename to frontends/monkey/401login.h diff --git a/monkey/Makefile.target b/frontends/monkey/Makefile similarity index 55% rename from monkey/Makefile.target rename to frontends/monkey/Makefile index 5813573c8..86f1d912e 100644 --- a/monkey/Makefile.target +++ b/frontends/monkey/Makefile @@ -7,17 +7,6 @@ # Monkey flag setup (using pkg-config) # ---------------------------------------------------------------------------- - -# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here -NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG -NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG -NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 -NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 - - CWARNFLAGS += -Werror CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \ @@ -30,19 +19,6 @@ CFLAGS += -std=c99 -Dmonkey -Dnsmonkey -g \ LDFLAGS += -lm -# non optional pkg-configed libs -$(eval $(call pkg_config_find_and_add,libcurl,Curl )) -$(eval $(call pkg_config_find_and_add,openssl,OpenSSL)) - -# optional pkg-config configured libraries -$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) -$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) -$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) - # --------------------------------------------------------------------------- # Windows flag setup # --------------------------------------------------------------------------- @@ -56,15 +32,14 @@ endif # ---------------------------------------------------------------------------- # S_MONKEY are sources purely for the MONKEY build -S_MONKEY := main.c filetype.c schedule.c bitmap.c plot.c browser.c \ +S_FRONTEND := main.c filetype.c schedule.c bitmap.c plot.c browser.c \ download.c 401login.c cert.c layout.c dispatch.c fetch.c -S_MONKEY := $(addprefix monkey/,$(S_MONKEY)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_MONKEY) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_PDF) $(S_FRONTEND) EXETARGET := nsmonkey # ---------------------------------------------------------------------------- diff --git a/monkey/Makefile.defaults b/frontends/monkey/Makefile.defaults similarity index 100% rename from monkey/Makefile.defaults rename to frontends/monkey/Makefile.defaults diff --git a/monkey/bitmap.c b/frontends/monkey/bitmap.c similarity index 100% rename from monkey/bitmap.c rename to frontends/monkey/bitmap.c diff --git a/monkey/bitmap.h b/frontends/monkey/bitmap.h similarity index 100% rename from monkey/bitmap.h rename to frontends/monkey/bitmap.h diff --git a/monkey/browser.c b/frontends/monkey/browser.c similarity index 100% rename from monkey/browser.c rename to frontends/monkey/browser.c diff --git a/monkey/browser.h b/frontends/monkey/browser.h similarity index 100% rename from monkey/browser.h rename to frontends/monkey/browser.h diff --git a/monkey/cert.c b/frontends/monkey/cert.c similarity index 100% rename from monkey/cert.c rename to frontends/monkey/cert.c diff --git a/monkey/cert.h b/frontends/monkey/cert.h similarity index 100% rename from monkey/cert.h rename to frontends/monkey/cert.h diff --git a/monkey/dispatch.c b/frontends/monkey/dispatch.c similarity index 100% rename from monkey/dispatch.c rename to frontends/monkey/dispatch.c diff --git a/monkey/dispatch.h b/frontends/monkey/dispatch.h similarity index 100% rename from monkey/dispatch.h rename to frontends/monkey/dispatch.h diff --git a/monkey/download.c b/frontends/monkey/download.c similarity index 100% rename from monkey/download.c rename to frontends/monkey/download.c diff --git a/monkey/fetch.c b/frontends/monkey/fetch.c similarity index 100% rename from monkey/fetch.c rename to frontends/monkey/fetch.c diff --git a/monkey/fetch.h b/frontends/monkey/fetch.h similarity index 100% rename from monkey/fetch.h rename to frontends/monkey/fetch.h diff --git a/monkey/filetype.c b/frontends/monkey/filetype.c similarity index 100% rename from monkey/filetype.c rename to frontends/monkey/filetype.c diff --git a/monkey/filetype.h b/frontends/monkey/filetype.h similarity index 100% rename from monkey/filetype.h rename to frontends/monkey/filetype.h diff --git a/monkey/layout.c b/frontends/monkey/layout.c similarity index 100% rename from monkey/layout.c rename to frontends/monkey/layout.c diff --git a/monkey/layout.h b/frontends/monkey/layout.h similarity index 100% rename from monkey/layout.h rename to frontends/monkey/layout.h diff --git a/monkey/main.c b/frontends/monkey/main.c similarity index 100% rename from monkey/main.c rename to frontends/monkey/main.c diff --git a/monkey/options.h b/frontends/monkey/options.h similarity index 100% rename from monkey/options.h rename to frontends/monkey/options.h diff --git a/monkey/plot.c b/frontends/monkey/plot.c similarity index 100% rename from monkey/plot.c rename to frontends/monkey/plot.c diff --git a/monkey/plot.h b/frontends/monkey/plot.h similarity index 100% rename from monkey/plot.h rename to frontends/monkey/plot.h diff --git a/monkey/res b/frontends/monkey/res similarity index 100% rename from monkey/res rename to frontends/monkey/res diff --git a/monkey/schedule.c b/frontends/monkey/schedule.c similarity index 100% rename from monkey/schedule.c rename to frontends/monkey/schedule.c diff --git a/monkey/schedule.h b/frontends/monkey/schedule.h similarity index 100% rename from monkey/schedule.h rename to frontends/monkey/schedule.h diff --git a/riscos/401login.c b/frontends/riscos/401login.c similarity index 100% rename from riscos/401login.c rename to frontends/riscos/401login.c diff --git a/riscos/Makefile.target b/frontends/riscos/Makefile similarity index 72% rename from riscos/Makefile.target rename to frontends/riscos/Makefile index e6e4b896f..6ed076800 100644 --- a/riscos/Makefile.target +++ b/frontends/riscos/Makefile @@ -7,30 +7,13 @@ # RISC OS target setup # ---------------------------------------------------------------------------- -ifeq ($(HOST),riscos) - LDFLAGS += -Xlinker -symbols=$(OBJROOT)/sym -lz -lm -lcurl -lcares - LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet -else - LDFLAGS += $(shell $(PKG_CONFIG) --libs libcares libcurl openssl) -endif +$(eval $(call pkg_config_find_and_add,libcares,Cares)) -$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) $(eval $(call feature_enabled,DRAW,-DWITH_DRAW,,Drawfile rendering)) $(eval $(call feature_enabled,SPRITE,-DWITH_SPRITE,,Sprite rendering)) $(eval $(call feature_enabled,ARTWORKS,-DWITH_ARTWORKS,,ArtWorks rendering)) $(eval $(call feature_enabled,DRAW_EXPORT,-DWITH_DRAW_EXPORT,-lpencil,Drawfile export)) -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG -NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 -NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 -$(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) -$(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) -$(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) -$(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) - TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \ !NetSurf/Resources/$(TPL)/Templates$(TPLEXT)) @@ -63,7 +46,7 @@ endif # ---------------------------------------------------------------------------- # S_RISCOS are sources purely for the RISC OS build -S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \ +S_FRONTEND := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \ dialog.c download.c filetype.c font.c \ global_history.c gui.c help.c history.c hotlist.c iconbar.c \ image.c menus.c message.c mouse.c palettes.c plotters.c \ @@ -79,23 +62,22 @@ S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \ $(addprefix configure/,con_cache.c con_connect.c con_content.c \ con_fonts.c con_home.c con_image.c con_inter.c con_language.c \ con_secure.c con_theme.c) -S_RISCOS := $(addprefix riscos/,$(S_RISCOS)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_RISCOS) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) EXETARGET := !NetSurf/!RunImage$(EXEEXT) # The filter and target for split messages MESSAGES_FILTER=ro -!NetSurf/!Run$(RUNEXT): riscos/scripts/Run $(EXETARGET) +!NetSurf/!Run$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Run $(EXETARGET) $(VQ)echo " MAKERUN: $@" $(Q)$(MAKERUN) $(EXETARGET) $< $@ -!NetSurf/!Help$(RUNEXT): riscos/scripts/Help +!NetSurf/!Help$(RUNEXT): $(FRONTEND_SOURCE_DIR)/scripts/Help $(VQ)echo " CP: $@" $(Q)cp $< $@ @@ -123,7 +105,7 @@ CLEANS += clean-run clean-help # Template objects TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these -TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS)) +TPL_RISCOS := $(addprefix $(FRONTEND_SOURCE_DIR)/templates/,$(TPL_RISCOS)) # Template target creation macro define compile_template @@ -161,11 +143,11 @@ netsurf.zip: $(EXETARGET) $(eval $@_TMPDIR := $(shell mktemp -d)) $(Q) $(RM) $@ $(Q) rsync --archive --verbose $(CURDIR)/!NetSurf $($@_TMPDIR) - $(Q) $(CURDIR)/utils/git-date.sh $(CURDIR)/riscos/distribution - $(Q) rsync --archive --verbose $(CURDIR)/riscos/distribution/!Boot $($@_TMPDIR) - $(Q) rsync --archive --verbose $(CURDIR)/riscos/distribution/!System $($@_TMPDIR) - $(Q) rsync --archive --verbose $(CURDIR)/riscos/distribution/3rdParty $($@_TMPDIR) - $(Q) cp $(CURDIR)/riscos/distribution/ReadMe $($@_TMPDIR) - $(Q) cp $(CURDIR)/riscos/distribution/LeesMij $($@_TMPDIR) + $(Q) $(CURDIR)/utils/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) $(RM) -rf $($@_TMPDIR) diff --git a/riscos/Makefile.defaults b/frontends/riscos/Makefile.defaults similarity index 88% rename from riscos/Makefile.defaults rename to frontends/riscos/Makefile.defaults index f719ee3de..aed361631 100644 --- a/riscos/Makefile.defaults +++ b/frontends/riscos/Makefile.defaults @@ -14,6 +14,10 @@ NETSURF_USE_DRAW := YES # Valid options: YES, NO NETSURF_USE_SPRITE := YES +# Enable NetSurf's use of librosprite for displaying RISC OS Sprites +# Valid options: YES, NO, AUTO +NETSURF_USE_ROSPRITE := NO + # Enable NetSurf's use of AWRender for displaying ArtWorks files # Valid options: YES, NO NETSURF_USE_ARTWORKS := YES diff --git a/riscos/assert.c b/frontends/riscos/assert.c similarity index 100% rename from riscos/assert.c rename to frontends/riscos/assert.c diff --git a/riscos/bitmap.c b/frontends/riscos/bitmap.c similarity index 100% rename from riscos/bitmap.c rename to frontends/riscos/bitmap.c diff --git a/riscos/bitmap.h b/frontends/riscos/bitmap.h similarity index 100% rename from riscos/bitmap.h rename to frontends/riscos/bitmap.h diff --git a/riscos/buffer.c b/frontends/riscos/buffer.c similarity index 100% rename from riscos/buffer.c rename to frontends/riscos/buffer.c diff --git a/riscos/buffer.h b/frontends/riscos/buffer.h similarity index 100% rename from riscos/buffer.h rename to frontends/riscos/buffer.h diff --git a/riscos/configure.c b/frontends/riscos/configure.c similarity index 100% rename from riscos/configure.c rename to frontends/riscos/configure.c diff --git a/riscos/configure.h b/frontends/riscos/configure.h similarity index 100% rename from riscos/configure.h rename to frontends/riscos/configure.h diff --git a/riscos/configure/con_cache.c b/frontends/riscos/configure/con_cache.c similarity index 100% rename from riscos/configure/con_cache.c rename to frontends/riscos/configure/con_cache.c diff --git a/riscos/configure/con_connect.c b/frontends/riscos/configure/con_connect.c similarity index 100% rename from riscos/configure/con_connect.c rename to frontends/riscos/configure/con_connect.c diff --git a/riscos/configure/con_content.c b/frontends/riscos/configure/con_content.c similarity index 100% rename from riscos/configure/con_content.c rename to frontends/riscos/configure/con_content.c diff --git a/riscos/configure/con_fonts.c b/frontends/riscos/configure/con_fonts.c similarity index 100% rename from riscos/configure/con_fonts.c rename to frontends/riscos/configure/con_fonts.c diff --git a/riscos/configure/con_home.c b/frontends/riscos/configure/con_home.c similarity index 100% rename from riscos/configure/con_home.c rename to frontends/riscos/configure/con_home.c diff --git a/riscos/configure/con_image.c b/frontends/riscos/configure/con_image.c similarity index 100% rename from riscos/configure/con_image.c rename to frontends/riscos/configure/con_image.c diff --git a/riscos/configure/con_inter.c b/frontends/riscos/configure/con_inter.c similarity index 100% rename from riscos/configure/con_inter.c rename to frontends/riscos/configure/con_inter.c diff --git a/riscos/configure/con_language.c b/frontends/riscos/configure/con_language.c similarity index 100% rename from riscos/configure/con_language.c rename to frontends/riscos/configure/con_language.c diff --git a/riscos/configure/con_secure.c b/frontends/riscos/configure/con_secure.c similarity index 100% rename from riscos/configure/con_secure.c rename to frontends/riscos/configure/con_secure.c diff --git a/riscos/configure/con_theme.c b/frontends/riscos/configure/con_theme.c similarity index 100% rename from riscos/configure/con_theme.c rename to frontends/riscos/configure/con_theme.c diff --git a/riscos/configure/configure.h b/frontends/riscos/configure/configure.h similarity index 100% rename from riscos/configure/configure.h rename to frontends/riscos/configure/configure.h diff --git a/riscos/content-handlers/artworks.c b/frontends/riscos/content-handlers/artworks.c similarity index 100% rename from riscos/content-handlers/artworks.c rename to frontends/riscos/content-handlers/artworks.c diff --git a/riscos/content-handlers/artworks.h b/frontends/riscos/content-handlers/artworks.h similarity index 100% rename from riscos/content-handlers/artworks.h rename to frontends/riscos/content-handlers/artworks.h diff --git a/riscos/content-handlers/awrender.s b/frontends/riscos/content-handlers/awrender.s similarity index 100% rename from riscos/content-handlers/awrender.s rename to frontends/riscos/content-handlers/awrender.s diff --git a/riscos/content-handlers/draw.c b/frontends/riscos/content-handlers/draw.c similarity index 100% rename from riscos/content-handlers/draw.c rename to frontends/riscos/content-handlers/draw.c diff --git a/riscos/content-handlers/draw.h b/frontends/riscos/content-handlers/draw.h similarity index 100% rename from riscos/content-handlers/draw.h rename to frontends/riscos/content-handlers/draw.h diff --git a/riscos/content-handlers/sprite.c b/frontends/riscos/content-handlers/sprite.c similarity index 100% rename from riscos/content-handlers/sprite.c rename to frontends/riscos/content-handlers/sprite.c diff --git a/riscos/content-handlers/sprite.h b/frontends/riscos/content-handlers/sprite.h similarity index 100% rename from riscos/content-handlers/sprite.h rename to frontends/riscos/content-handlers/sprite.h diff --git a/riscos/cookies.c b/frontends/riscos/cookies.c similarity index 100% rename from riscos/cookies.c rename to frontends/riscos/cookies.c diff --git a/riscos/cookies.h b/frontends/riscos/cookies.h similarity index 100% rename from riscos/cookies.h rename to frontends/riscos/cookies.h diff --git a/riscos/dialog.c b/frontends/riscos/dialog.c similarity index 100% rename from riscos/dialog.c rename to frontends/riscos/dialog.c diff --git a/riscos/dialog.h b/frontends/riscos/dialog.h similarity index 100% rename from riscos/dialog.h rename to frontends/riscos/dialog.h diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/!Boot,feb rename to frontends/riscos/distribution/!Boot/Resources/!Cache/!Boot,feb diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Help,feb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Help,feb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/!Help,feb rename to frontends/riscos/distribution/!Boot/Resources/!Cache/!Help,feb diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Run,feb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Run,feb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/!Run,feb rename to frontends/riscos/distribution/!Boot/Resources/!Cache/!Run,feb diff --git a/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb b/frontends/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb rename to frontends/riscos/distribution/!Boot/Resources/!Cache/!RunImage,ffb diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 rename to frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites,ff9 diff --git a/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 rename to frontends/riscos/distribution/!Boot/Resources/!Cache/!Sprites22,ff9 diff --git a/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank b/frontends/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Caches/Blank rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Caches/Blank diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/MultiError,ffb diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/ResFind,ffb diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/!Meta diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Help diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Messages diff --git a/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec b/frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec similarity index 100% rename from riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec rename to frontends/riscos/distribution/!Boot/Resources/!Cache/Resources/UK/Templates,fec diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/!Boot,feb diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Help b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Help similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/!Help rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/!Help diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/!Run,feb rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/!Run,feb diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites,ff9 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites11,ff9 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/!Sprites22,ff9 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Acorn/Latin1 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/CentEuro diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Cyrillic diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Roman diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Apple/Ukrainian diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/BigFive diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C0/40[ISO646] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/C1/43[IS6429] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/40[646old] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/41[646-GB] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/42[646IRV] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/43[FinSwe] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/47[646-SE] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/48[646-SE] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/49[JS201K] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4A[JS201R] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4B[646-DE] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/4C[646-PT] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/54[GB1988] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/56[Teltxt] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/59[646-IT] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/5A[646-ES] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/60[646-NO] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/66[646-FR] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/69[646-HU] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6B[Arabic] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/6C[IS6937] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94/7A[SerbCr] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/40[JS6226] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/41[GB2312] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/42[JIS208] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/43[KS1001] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/44[JIS212] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/47[CNS1] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/48[CNS2] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/49[CNS3] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4A[CNS4] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4B[CNS5] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4C[CNS6] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G94x94/4D[CNS7] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/41[Lat1] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/42[Lat2] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/43[Lat3] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/44[Lat4] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/46[Greek] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/47[Arabic] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/48[Hebrew] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4C[Cyrill] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/4D[Lat5] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/50[LatSup] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/52[IS6937] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/54[Thai] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/56[Lat6] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/58[L6Sami] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/59[Lat7] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5C[Welsh] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5D[Sami] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5E[Hebrew] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/5F[Lat8] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/62[Lat9] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10] b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10] similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10] rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/ISO2022/G96/66[Lat10] diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/KOI8-R diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1250 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1251 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1252 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1253 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1254 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP1256 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP866 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP874 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932 b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932 similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932 rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Encodings/Microsoft/CP932 diff --git a/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases b/frontends/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases similarity index 100% rename from riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases rename to frontends/riscos/distribution/!Boot/Resources/!Unicode/Files/Aliases diff --git a/riscos/distribution/!System/310/Modules/CryptRand,ffa b/frontends/riscos/distribution/!System/310/Modules/CryptRand,ffa similarity index 100% rename from riscos/distribution/!System/310/Modules/CryptRand,ffa rename to frontends/riscos/distribution/!System/310/Modules/CryptRand,ffa diff --git a/riscos/distribution/!System/310/Modules/Iconv,ffa b/frontends/riscos/distribution/!System/310/Modules/Iconv,ffa similarity index 100% rename from riscos/distribution/!System/310/Modules/Iconv,ffa rename to frontends/riscos/distribution/!System/310/Modules/Iconv,ffa diff --git a/riscos/distribution/!System/310/Modules/Network/URI,ffa b/frontends/riscos/distribution/!System/310/Modules/Network/URI,ffa similarity index 100% rename from riscos/distribution/!System/310/Modules/Network/URI,ffa rename to frontends/riscos/distribution/!System/310/Modules/Network/URI,ffa diff --git a/riscos/distribution/!System/310/Modules/SharedULib,ffa b/frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa similarity index 100% rename from riscos/distribution/!System/310/Modules/SharedULib,ffa rename to frontends/riscos/distribution/!System/310/Modules/SharedULib,ffa diff --git a/riscos/distribution/!System/310/Modules/Tinct,ffa b/frontends/riscos/distribution/!System/310/Modules/Tinct,ffa similarity index 100% rename from riscos/distribution/!System/310/Modules/Tinct,ffa rename to frontends/riscos/distribution/!System/310/Modules/Tinct,ffa diff --git a/riscos/distribution/3rdParty/AcornURI/!ReadMe b/frontends/riscos/distribution/3rdParty/AcornURI/!ReadMe similarity index 100% rename from riscos/distribution/3rdParty/AcornURI/!ReadMe rename to frontends/riscos/distribution/3rdParty/AcornURI/!ReadMe diff --git a/riscos/distribution/3rdParty/AcornURI/Copying b/frontends/riscos/distribution/3rdParty/AcornURI/Copying similarity index 100% rename from riscos/distribution/3rdParty/AcornURI/Copying rename to frontends/riscos/distribution/3rdParty/AcornURI/Copying diff --git a/riscos/distribution/3rdParty/CryptRand/Copyright b/frontends/riscos/distribution/3rdParty/CryptRand/Copyright similarity index 100% rename from riscos/distribution/3rdParty/CryptRand/Copyright rename to frontends/riscos/distribution/3rdParty/CryptRand/Copyright diff --git a/riscos/distribution/3rdParty/Iconv/ReadMe b/frontends/riscos/distribution/3rdParty/Iconv/ReadMe similarity index 100% rename from riscos/distribution/3rdParty/Iconv/ReadMe rename to frontends/riscos/distribution/3rdParty/Iconv/ReadMe diff --git a/riscos/distribution/3rdParty/Iconv/doc/API b/frontends/riscos/distribution/3rdParty/Iconv/doc/API similarity index 100% rename from riscos/distribution/3rdParty/Iconv/doc/API rename to frontends/riscos/distribution/3rdParty/Iconv/doc/API diff --git a/riscos/distribution/3rdParty/Iconv/doc/ChangeLog b/frontends/riscos/distribution/3rdParty/Iconv/doc/ChangeLog similarity index 100% rename from riscos/distribution/3rdParty/Iconv/doc/ChangeLog rename to frontends/riscos/distribution/3rdParty/Iconv/doc/ChangeLog diff --git a/riscos/distribution/3rdParty/Iconv/doc/Uni-iconv b/frontends/riscos/distribution/3rdParty/Iconv/doc/Uni-iconv similarity index 100% rename from riscos/distribution/3rdParty/Iconv/doc/Uni-iconv rename to frontends/riscos/distribution/3rdParty/Iconv/doc/Uni-iconv diff --git a/riscos/distribution/3rdParty/SharedULib/Copyright b/frontends/riscos/distribution/3rdParty/SharedULib/Copyright similarity index 100% rename from riscos/distribution/3rdParty/SharedULib/Copyright rename to frontends/riscos/distribution/3rdParty/SharedULib/Copyright diff --git a/riscos/distribution/3rdParty/Tinct/!Help b/frontends/riscos/distribution/3rdParty/Tinct/!Help similarity index 100% rename from riscos/distribution/3rdParty/Tinct/!Help rename to frontends/riscos/distribution/3rdParty/Tinct/!Help diff --git a/riscos/distribution/LeesMij b/frontends/riscos/distribution/LeesMij similarity index 100% rename from riscos/distribution/LeesMij rename to frontends/riscos/distribution/LeesMij diff --git a/riscos/distribution/ReadMe b/frontends/riscos/distribution/ReadMe similarity index 100% rename from riscos/distribution/ReadMe rename to frontends/riscos/distribution/ReadMe diff --git a/riscos/download.c b/frontends/riscos/download.c similarity index 100% rename from riscos/download.c rename to frontends/riscos/download.c diff --git a/riscos/filetype.c b/frontends/riscos/filetype.c similarity index 100% rename from riscos/filetype.c rename to frontends/riscos/filetype.c diff --git a/riscos/filetype.h b/frontends/riscos/filetype.h similarity index 100% rename from riscos/filetype.h rename to frontends/riscos/filetype.h diff --git a/riscos/font.c b/frontends/riscos/font.c similarity index 100% rename from riscos/font.c rename to frontends/riscos/font.c diff --git a/riscos/font.h b/frontends/riscos/font.h similarity index 100% rename from riscos/font.h rename to frontends/riscos/font.h diff --git a/riscos/global_history.c b/frontends/riscos/global_history.c similarity index 100% rename from riscos/global_history.c rename to frontends/riscos/global_history.c diff --git a/riscos/global_history.h b/frontends/riscos/global_history.h similarity index 100% rename from riscos/global_history.h rename to frontends/riscos/global_history.h diff --git a/riscos/gui.c b/frontends/riscos/gui.c similarity index 100% rename from riscos/gui.c rename to frontends/riscos/gui.c diff --git a/riscos/gui.h b/frontends/riscos/gui.h similarity index 100% rename from riscos/gui.h rename to frontends/riscos/gui.h diff --git a/riscos/gui/button_bar.c b/frontends/riscos/gui/button_bar.c similarity index 100% rename from riscos/gui/button_bar.c rename to frontends/riscos/gui/button_bar.c diff --git a/riscos/gui/button_bar.h b/frontends/riscos/gui/button_bar.h similarity index 100% rename from riscos/gui/button_bar.h rename to frontends/riscos/gui/button_bar.h diff --git a/riscos/gui/progress_bar.c b/frontends/riscos/gui/progress_bar.c similarity index 100% rename from riscos/gui/progress_bar.c rename to frontends/riscos/gui/progress_bar.c diff --git a/riscos/gui/progress_bar.h b/frontends/riscos/gui/progress_bar.h similarity index 100% rename from riscos/gui/progress_bar.h rename to frontends/riscos/gui/progress_bar.h diff --git a/riscos/gui/status_bar.c b/frontends/riscos/gui/status_bar.c similarity index 100% rename from riscos/gui/status_bar.c rename to frontends/riscos/gui/status_bar.c diff --git a/riscos/gui/status_bar.h b/frontends/riscos/gui/status_bar.h similarity index 100% rename from riscos/gui/status_bar.h rename to frontends/riscos/gui/status_bar.h diff --git a/riscos/gui/throbber.c b/frontends/riscos/gui/throbber.c similarity index 100% rename from riscos/gui/throbber.c rename to frontends/riscos/gui/throbber.c diff --git a/riscos/gui/throbber.h b/frontends/riscos/gui/throbber.h similarity index 100% rename from riscos/gui/throbber.h rename to frontends/riscos/gui/throbber.h diff --git a/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c similarity index 100% rename from riscos/gui/url_bar.c rename to frontends/riscos/gui/url_bar.c diff --git a/riscos/gui/url_bar.h b/frontends/riscos/gui/url_bar.h similarity index 100% rename from riscos/gui/url_bar.h rename to frontends/riscos/gui/url_bar.h diff --git a/riscos/help.c b/frontends/riscos/help.c similarity index 100% rename from riscos/help.c rename to frontends/riscos/help.c diff --git a/riscos/help.h b/frontends/riscos/help.h similarity index 100% rename from riscos/help.h rename to frontends/riscos/help.h diff --git a/riscos/history.c b/frontends/riscos/history.c similarity index 100% rename from riscos/history.c rename to frontends/riscos/history.c diff --git a/riscos/hotlist.c b/frontends/riscos/hotlist.c similarity index 100% rename from riscos/hotlist.c rename to frontends/riscos/hotlist.c diff --git a/riscos/hotlist.h b/frontends/riscos/hotlist.h similarity index 100% rename from riscos/hotlist.h rename to frontends/riscos/hotlist.h diff --git a/riscos/iconbar.c b/frontends/riscos/iconbar.c similarity index 100% rename from riscos/iconbar.c rename to frontends/riscos/iconbar.c diff --git a/riscos/iconbar.h b/frontends/riscos/iconbar.h similarity index 100% rename from riscos/iconbar.h rename to frontends/riscos/iconbar.h diff --git a/riscos/image.c b/frontends/riscos/image.c similarity index 100% rename from riscos/image.c rename to frontends/riscos/image.c diff --git a/riscos/image.h b/frontends/riscos/image.h similarity index 100% rename from riscos/image.h rename to frontends/riscos/image.h diff --git a/riscos/menus.c b/frontends/riscos/menus.c similarity index 100% rename from riscos/menus.c rename to frontends/riscos/menus.c diff --git a/riscos/menus.h b/frontends/riscos/menus.h similarity index 100% rename from riscos/menus.h rename to frontends/riscos/menus.h diff --git a/riscos/message.c b/frontends/riscos/message.c similarity index 100% rename from riscos/message.c rename to frontends/riscos/message.c diff --git a/riscos/message.h b/frontends/riscos/message.h similarity index 100% rename from riscos/message.h rename to frontends/riscos/message.h diff --git a/riscos/mouse.c b/frontends/riscos/mouse.c similarity index 100% rename from riscos/mouse.c rename to frontends/riscos/mouse.c diff --git a/riscos/mouse.h b/frontends/riscos/mouse.h similarity index 100% rename from riscos/mouse.h rename to frontends/riscos/mouse.h diff --git a/riscos/options.h b/frontends/riscos/options.h similarity index 100% rename from riscos/options.h rename to frontends/riscos/options.h diff --git a/riscos/oslib_pre7.h b/frontends/riscos/oslib_pre7.h similarity index 100% rename from riscos/oslib_pre7.h rename to frontends/riscos/oslib_pre7.h diff --git a/riscos/palettes.c b/frontends/riscos/palettes.c similarity index 100% rename from riscos/palettes.c rename to frontends/riscos/palettes.c diff --git a/riscos/palettes.h b/frontends/riscos/palettes.h similarity index 100% rename from riscos/palettes.h rename to frontends/riscos/palettes.h diff --git a/riscos/plotters.c b/frontends/riscos/plotters.c similarity index 100% rename from riscos/plotters.c rename to frontends/riscos/plotters.c diff --git a/riscos/print.c b/frontends/riscos/print.c similarity index 100% rename from riscos/print.c rename to frontends/riscos/print.c diff --git a/riscos/print.h b/frontends/riscos/print.h similarity index 100% rename from riscos/print.h rename to frontends/riscos/print.h diff --git a/riscos/query.c b/frontends/riscos/query.c similarity index 100% rename from riscos/query.c rename to frontends/riscos/query.c diff --git a/riscos/query.h b/frontends/riscos/query.h similarity index 100% rename from riscos/query.h rename to frontends/riscos/query.h diff --git a/riscos/save.c b/frontends/riscos/save.c similarity index 100% rename from riscos/save.c rename to frontends/riscos/save.c diff --git a/riscos/save.h b/frontends/riscos/save.h similarity index 100% rename from riscos/save.h rename to frontends/riscos/save.h diff --git a/riscos/save_draw.c b/frontends/riscos/save_draw.c similarity index 100% rename from riscos/save_draw.c rename to frontends/riscos/save_draw.c diff --git a/riscos/save_draw.h b/frontends/riscos/save_draw.h similarity index 100% rename from riscos/save_draw.h rename to frontends/riscos/save_draw.h diff --git a/riscos/save_pdf.c b/frontends/riscos/save_pdf.c similarity index 100% rename from riscos/save_pdf.c rename to frontends/riscos/save_pdf.c diff --git a/riscos/save_pdf.h b/frontends/riscos/save_pdf.h similarity index 100% rename from riscos/save_pdf.h rename to frontends/riscos/save_pdf.h diff --git a/riscos/schedule.c b/frontends/riscos/schedule.c similarity index 100% rename from riscos/schedule.c rename to frontends/riscos/schedule.c diff --git a/riscos/scripts/Help b/frontends/riscos/scripts/Help similarity index 100% rename from riscos/scripts/Help rename to frontends/riscos/scripts/Help diff --git a/riscos/scripts/Run b/frontends/riscos/scripts/Run similarity index 100% rename from riscos/scripts/Run rename to frontends/riscos/scripts/Run diff --git a/riscos/search.c b/frontends/riscos/search.c similarity index 100% rename from riscos/search.c rename to frontends/riscos/search.c diff --git a/riscos/searchweb.c b/frontends/riscos/searchweb.c similarity index 100% rename from riscos/searchweb.c rename to frontends/riscos/searchweb.c diff --git a/riscos/sslcert.c b/frontends/riscos/sslcert.c similarity index 100% rename from riscos/sslcert.c rename to frontends/riscos/sslcert.c diff --git a/riscos/sslcert.h b/frontends/riscos/sslcert.h similarity index 100% rename from riscos/sslcert.h rename to frontends/riscos/sslcert.h diff --git a/riscos/templates/de b/frontends/riscos/templates/de similarity index 100% rename from riscos/templates/de rename to frontends/riscos/templates/de diff --git a/riscos/templates/en b/frontends/riscos/templates/en similarity index 100% rename from riscos/templates/en rename to frontends/riscos/templates/en diff --git a/riscos/templates/fr b/frontends/riscos/templates/fr similarity index 100% rename from riscos/templates/fr rename to frontends/riscos/templates/fr diff --git a/riscos/templates/nl b/frontends/riscos/templates/nl similarity index 100% rename from riscos/templates/nl rename to frontends/riscos/templates/nl diff --git a/riscos/textarea.c b/frontends/riscos/textarea.c similarity index 100% rename from riscos/textarea.c rename to frontends/riscos/textarea.c diff --git a/riscos/textarea.h b/frontends/riscos/textarea.h similarity index 100% rename from riscos/textarea.h rename to frontends/riscos/textarea.h diff --git a/riscos/textselection.c b/frontends/riscos/textselection.c similarity index 100% rename from riscos/textselection.c rename to frontends/riscos/textselection.c diff --git a/riscos/textselection.h b/frontends/riscos/textselection.h similarity index 100% rename from riscos/textselection.h rename to frontends/riscos/textselection.h diff --git a/riscos/theme.c b/frontends/riscos/theme.c similarity index 100% rename from riscos/theme.c rename to frontends/riscos/theme.c diff --git a/riscos/theme.h b/frontends/riscos/theme.h similarity index 100% rename from riscos/theme.h rename to frontends/riscos/theme.h diff --git a/riscos/theme_install.c b/frontends/riscos/theme_install.c similarity index 100% rename from riscos/theme_install.c rename to frontends/riscos/theme_install.c diff --git a/riscos/tinct.h b/frontends/riscos/tinct.h similarity index 100% rename from riscos/tinct.h rename to frontends/riscos/tinct.h diff --git a/riscos/toolbar.c b/frontends/riscos/toolbar.c similarity index 100% rename from riscos/toolbar.c rename to frontends/riscos/toolbar.c diff --git a/riscos/toolbar.h b/frontends/riscos/toolbar.h similarity index 100% rename from riscos/toolbar.h rename to frontends/riscos/toolbar.h diff --git a/riscos/treeview.c b/frontends/riscos/treeview.c similarity index 100% rename from riscos/treeview.c rename to frontends/riscos/treeview.c diff --git a/riscos/treeview.h b/frontends/riscos/treeview.h similarity index 100% rename from riscos/treeview.h rename to frontends/riscos/treeview.h diff --git a/riscos/ucstables.c b/frontends/riscos/ucstables.c similarity index 100% rename from riscos/ucstables.c rename to frontends/riscos/ucstables.c diff --git a/riscos/ucstables.h b/frontends/riscos/ucstables.h similarity index 100% rename from riscos/ucstables.h rename to frontends/riscos/ucstables.h diff --git a/riscos/uri.c b/frontends/riscos/uri.c similarity index 100% rename from riscos/uri.c rename to frontends/riscos/uri.c diff --git a/riscos/uri.h b/frontends/riscos/uri.h similarity index 100% rename from riscos/uri.h rename to frontends/riscos/uri.h diff --git a/riscos/url_complete.c b/frontends/riscos/url_complete.c similarity index 100% rename from riscos/url_complete.c rename to frontends/riscos/url_complete.c diff --git a/riscos/url_complete.h b/frontends/riscos/url_complete.h similarity index 100% rename from riscos/url_complete.h rename to frontends/riscos/url_complete.h diff --git a/riscos/url_protocol.c b/frontends/riscos/url_protocol.c similarity index 100% rename from riscos/url_protocol.c rename to frontends/riscos/url_protocol.c diff --git a/riscos/url_protocol.h b/frontends/riscos/url_protocol.h similarity index 100% rename from riscos/url_protocol.h rename to frontends/riscos/url_protocol.h diff --git a/riscos/url_suggest.c b/frontends/riscos/url_suggest.c similarity index 100% rename from riscos/url_suggest.c rename to frontends/riscos/url_suggest.c diff --git a/riscos/url_suggest.h b/frontends/riscos/url_suggest.h similarity index 100% rename from riscos/url_suggest.h rename to frontends/riscos/url_suggest.h diff --git a/riscos/wimp.c b/frontends/riscos/wimp.c similarity index 100% rename from riscos/wimp.c rename to frontends/riscos/wimp.c diff --git a/riscos/wimp.h b/frontends/riscos/wimp.h similarity index 100% rename from riscos/wimp.h rename to frontends/riscos/wimp.h diff --git a/riscos/wimp_event.c b/frontends/riscos/wimp_event.c similarity index 100% rename from riscos/wimp_event.c rename to frontends/riscos/wimp_event.c diff --git a/riscos/wimp_event.h b/frontends/riscos/wimp_event.h similarity index 100% rename from riscos/wimp_event.h rename to frontends/riscos/wimp_event.h diff --git a/riscos/wimputils.h b/frontends/riscos/wimputils.h similarity index 100% rename from riscos/wimputils.h rename to frontends/riscos/wimputils.h diff --git a/riscos/window.c b/frontends/riscos/window.c similarity index 100% rename from riscos/window.c rename to frontends/riscos/window.c diff --git a/riscos/window.h b/frontends/riscos/window.h similarity index 100% rename from riscos/window.h rename to frontends/riscos/window.h diff --git a/windows/Makefile.target b/frontends/windows/Makefile similarity index 64% rename from windows/Makefile.target rename to frontends/windows/Makefile index 1f2dcba24..a3a95d9da 100644 --- a/windows/Makefile.target +++ b/frontends/windows/Makefile @@ -6,24 +6,10 @@ LDFLAGS += -L${GCCSDK_INSTALL_ENV}/lib CFLAGS += -I${GCCSDK_INSTALL_ENV}/include/ -NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG -NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE -NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP -NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF -NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG -$(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp))) -$(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif))) -$(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) -$(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) +$(eval $(call pkg_config_find_and_add,libcares,Cares)) +$(eval $(call pkg_config_find_and_add,zlib,ZLib)) -ifneq ($(PKG_CONFIG),) - $(eval $(call pkg_config_find_and_add,zlib,ZLib)) - $(eval $(call pkg_config_find_and_add,libcurl,Curl)) - $(eval $(call pkg_config_find_and_add,libcares,Cares)) -else - LDFLAGS += -lcurl -lz -endif LDFLAGS += -lssl -lcrypto -lgnurx -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows @@ -46,7 +32,7 @@ LDFLAGS += $(WSCFLAGS) # built-in resource setup # ---------------------------------------------------------------------------- -$(OBJROOT)/windows_resource.o: windows/res/resource.rc +$(OBJROOT)/windows_resource.o: $(FRONTEND_RESOURCES_DIR)/resource.rc $(VQ)echo " WINDRES: compiling windows resources" ${Q}$(WINDRES) $< -O coff -o $@ @@ -56,16 +42,15 @@ S_RESOURCES := windows_resource.o # Source file setup # ---------------------------------------------------------------------------- -# S_WINDOWS are sources purely for the windows build -S_WINDOWS := main.c window.c gui.c drawable.c plot.c findfile.c \ +# sources purely for the windows build +S_FRONTEND := main.c window.c gui.c drawable.c plot.c findfile.c \ font.c bitmap.c about.c prefs.c download.c filetype.c file.c \ localhistory.c schedule.c windbg.c pointers.c -S_WINDOWS := $(addprefix windows/,$(S_WINDOWS)) # This is the final source build list # Note this is deliberately *not* expanded here as common and image # are not yet available -SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_WINDOWS) $(S_RESOURCES) +SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_RESOURCES) EXETARGET := NetSurf.exe # ---------------------------------------------------------------------------- @@ -81,10 +66,10 @@ install-windows: package-windows: netsurf-installer.exe WIN_RES_OBJ := installer.nsi NetSurf.ico netsurf.png welcome.html default.css -WIN_RES_INS_OBJ := $(addprefix windows/res/,$(WIN_RES_OBJ)) $(OBJROOT)/messages +WIN_RES_INS_OBJ := $(addprefix $(FRONTEND_RESOURCES_DIR)/,$(WIN_RES_OBJ)) $(OBJROOT)/messages $(OBJROOT)/messages: resources/FatMessages $(Q)$(SPLIT_MESSAGES) -l en -p win -f messages resources/FatMessages > $@ netsurf-installer.exe: $(EXETARGET) $(WIN_RES_INS_OBJ) - makensis -V4 -NOCD windows/res/installer.nsi + makensis -V4 -NOCD $(FRONTEND_RESOURCES_DIR)/installer.nsi diff --git a/windows/Makefile.defaults b/frontends/windows/Makefile.defaults similarity index 80% rename from windows/Makefile.defaults rename to frontends/windows/Makefile.defaults index 85472ba11..1d844f112 100644 --- a/windows/Makefile.defaults +++ b/frontends/windows/Makefile.defaults @@ -2,6 +2,10 @@ # windows-specific options # ---------------------------------------------------------------------------- +# Where to search for NetSurf's resources after looking in ~/.netsurf and +# $NETSURFRES. It must have a trailing backslash +NETSURF_WINDOWS_RESPATH := + # Enable NetSurf's use of librosprite for displaying RISC OS Sprites # Valid options: YES, NO, AUTO NETSURF_USE_ROSPRITE := NO diff --git a/windows/about.c b/frontends/windows/about.c similarity index 100% rename from windows/about.c rename to frontends/windows/about.c diff --git a/windows/about.h b/frontends/windows/about.h similarity index 100% rename from windows/about.h rename to frontends/windows/about.h diff --git a/windows/bitmap.c b/frontends/windows/bitmap.c similarity index 100% rename from windows/bitmap.c rename to frontends/windows/bitmap.c diff --git a/windows/bitmap.h b/frontends/windows/bitmap.h similarity index 100% rename from windows/bitmap.h rename to frontends/windows/bitmap.h diff --git a/windows/download.c b/frontends/windows/download.c similarity index 100% rename from windows/download.c rename to frontends/windows/download.c diff --git a/windows/download.h b/frontends/windows/download.h similarity index 100% rename from windows/download.h rename to frontends/windows/download.h diff --git a/windows/drawable.c b/frontends/windows/drawable.c similarity index 100% rename from windows/drawable.c rename to frontends/windows/drawable.c diff --git a/windows/drawable.h b/frontends/windows/drawable.h similarity index 100% rename from windows/drawable.h rename to frontends/windows/drawable.h diff --git a/windows/file.c b/frontends/windows/file.c similarity index 100% rename from windows/file.c rename to frontends/windows/file.c diff --git a/windows/file.h b/frontends/windows/file.h similarity index 100% rename from windows/file.h rename to frontends/windows/file.h diff --git a/windows/filetype.c b/frontends/windows/filetype.c similarity index 100% rename from windows/filetype.c rename to frontends/windows/filetype.c diff --git a/windows/filetype.h b/frontends/windows/filetype.h similarity index 100% rename from windows/filetype.h rename to frontends/windows/filetype.h diff --git a/windows/findfile.c b/frontends/windows/findfile.c similarity index 100% rename from windows/findfile.c rename to frontends/windows/findfile.c diff --git a/windows/findfile.h b/frontends/windows/findfile.h similarity index 100% rename from windows/findfile.h rename to frontends/windows/findfile.h diff --git a/windows/font.c b/frontends/windows/font.c similarity index 100% rename from windows/font.c rename to frontends/windows/font.c diff --git a/windows/font.h b/frontends/windows/font.h similarity index 100% rename from windows/font.h rename to frontends/windows/font.h diff --git a/windows/gui.c b/frontends/windows/gui.c similarity index 100% rename from windows/gui.c rename to frontends/windows/gui.c diff --git a/windows/gui.h b/frontends/windows/gui.h similarity index 100% rename from windows/gui.h rename to frontends/windows/gui.h diff --git a/windows/localhistory.c b/frontends/windows/localhistory.c similarity index 100% rename from windows/localhistory.c rename to frontends/windows/localhistory.c diff --git a/windows/localhistory.h b/frontends/windows/localhistory.h similarity index 100% rename from windows/localhistory.h rename to frontends/windows/localhistory.h diff --git a/windows/main.c b/frontends/windows/main.c similarity index 100% rename from windows/main.c rename to frontends/windows/main.c diff --git a/windows/plot.c b/frontends/windows/plot.c similarity index 100% rename from windows/plot.c rename to frontends/windows/plot.c diff --git a/windows/plot.h b/frontends/windows/plot.h similarity index 100% rename from windows/plot.h rename to frontends/windows/plot.h diff --git a/windows/pointers.c b/frontends/windows/pointers.c similarity index 100% rename from windows/pointers.c rename to frontends/windows/pointers.c diff --git a/windows/pointers.h b/frontends/windows/pointers.h similarity index 100% rename from windows/pointers.h rename to frontends/windows/pointers.h diff --git a/windows/prefs.c b/frontends/windows/prefs.c similarity index 100% rename from windows/prefs.c rename to frontends/windows/prefs.c diff --git a/windows/prefs.h b/frontends/windows/prefs.h similarity index 100% rename from windows/prefs.h rename to frontends/windows/prefs.h diff --git a/windows/res/NetSurf.ico b/frontends/windows/res/NetSurf.ico similarity index 100% rename from windows/res/NetSurf.ico rename to frontends/windows/res/NetSurf.ico diff --git a/frontends/windows/res/adblock.css b/frontends/windows/res/adblock.css new file mode 120000 index 000000000..ff2485622 --- /dev/null +++ b/frontends/windows/res/adblock.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/windows/res/banner.bmp b/frontends/windows/res/banner.bmp similarity index 100% rename from windows/res/banner.bmp rename to frontends/windows/res/banner.bmp diff --git a/frontends/windows/res/ca-bundle.crt b/frontends/windows/res/ca-bundle.crt new file mode 120000 index 000000000..0b0e416ad --- /dev/null +++ b/frontends/windows/res/ca-bundle.crt @@ -0,0 +1 @@ +../../../!NetSurf/Resources/ca-bundle \ No newline at end of file diff --git a/frontends/windows/res/credits.html b/frontends/windows/res/credits.html new file mode 120000 index 000000000..1ba17392b --- /dev/null +++ b/frontends/windows/res/credits.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/credits.html,faf \ No newline at end of file diff --git a/frontends/windows/res/default.css b/frontends/windows/res/default.css new file mode 120000 index 000000000..a8579eb7c --- /dev/null +++ b/frontends/windows/res/default.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/windows/res/home.bmp b/frontends/windows/res/home.bmp similarity index 100% rename from windows/res/home.bmp rename to frontends/windows/res/home.bmp diff --git a/windows/res/icons/back.png b/frontends/windows/res/icons/back.png similarity index 100% rename from windows/res/icons/back.png rename to frontends/windows/res/icons/back.png diff --git a/windows/res/icons/back_g.png b/frontends/windows/res/icons/back_g.png similarity index 100% rename from windows/res/icons/back_g.png rename to frontends/windows/res/icons/back_g.png diff --git a/windows/res/icons/back_h.png b/frontends/windows/res/icons/back_h.png similarity index 100% rename from windows/res/icons/back_h.png rename to frontends/windows/res/icons/back_h.png diff --git a/windows/res/icons/forward.png b/frontends/windows/res/icons/forward.png similarity index 100% rename from windows/res/icons/forward.png rename to frontends/windows/res/icons/forward.png diff --git a/windows/res/icons/forward_g.png b/frontends/windows/res/icons/forward_g.png similarity index 100% rename from windows/res/icons/forward_g.png rename to frontends/windows/res/icons/forward_g.png diff --git a/windows/res/icons/forward_h.png b/frontends/windows/res/icons/forward_h.png similarity index 100% rename from windows/res/icons/forward_h.png rename to frontends/windows/res/icons/forward_h.png diff --git a/windows/res/icons/home.png b/frontends/windows/res/icons/home.png similarity index 100% rename from windows/res/icons/home.png rename to frontends/windows/res/icons/home.png diff --git a/windows/res/icons/home_g.png b/frontends/windows/res/icons/home_g.png similarity index 100% rename from windows/res/icons/home_g.png rename to frontends/windows/res/icons/home_g.png diff --git a/windows/res/icons/home_h.png b/frontends/windows/res/icons/home_h.png similarity index 100% rename from windows/res/icons/home_h.png rename to frontends/windows/res/icons/home_h.png diff --git a/windows/res/icons/reload.png b/frontends/windows/res/icons/reload.png similarity index 100% rename from windows/res/icons/reload.png rename to frontends/windows/res/icons/reload.png diff --git a/windows/res/icons/reload_g.png b/frontends/windows/res/icons/reload_g.png similarity index 100% rename from windows/res/icons/reload_g.png rename to frontends/windows/res/icons/reload_g.png diff --git a/windows/res/icons/reload_h.png b/frontends/windows/res/icons/reload_h.png similarity index 100% rename from windows/res/icons/reload_h.png rename to frontends/windows/res/icons/reload_h.png diff --git a/windows/res/icons/stop.png b/frontends/windows/res/icons/stop.png similarity index 100% rename from windows/res/icons/stop.png rename to frontends/windows/res/icons/stop.png diff --git a/windows/res/icons/stop_g.png b/frontends/windows/res/icons/stop_g.png similarity index 100% rename from windows/res/icons/stop_g.png rename to frontends/windows/res/icons/stop_g.png diff --git a/windows/res/icons/stop_h.png b/frontends/windows/res/icons/stop_h.png similarity index 100% rename from windows/res/icons/stop_h.png rename to frontends/windows/res/icons/stop_h.png diff --git a/windows/res/installer.nsi b/frontends/windows/res/installer.nsi similarity index 91% rename from windows/res/installer.nsi rename to frontends/windows/res/installer.nsi index df726c8f8..0c733db2e 100644 --- a/windows/res/installer.nsi +++ b/frontends/windows/res/installer.nsi @@ -26,7 +26,7 @@ InstallDir "$PROGRAMFILES\${COMPANYNAME}\${APPNAME}" LicenseData "COPYING" # This will be in the installer/uninstaller's title bar Name "${COMPANYNAME} - ${APPNAME}" -Icon "windows\res\NetSurf.ico" +Icon "frontends\windows\res\NetSurf.ico" outFile "netsurf-installer.exe" BrandingText "${COMPANYNAME}" @@ -57,16 +57,16 @@ section "install" setOutPath $INSTDIR # Files added here should be removed by the uninstaller (see section "uninstall") file "NetSurf.exe" - file /oname=NetSurf.ico "windows\res\NetSurf.ico" - file /oname=default.css "windows\res\default.css" - file /oname=internal.css "windows\res\internal.css" - file /oname=adblock.css "windows\res\adblock.css" - file /oname=welcome.html "windows\res\welcome.html" - file /oname=credits.html "windows\res\credits.html" - file /oname=licence.html "windows\res\licence.html" - file /oname=netsurf.png "windows\res\netsurf.png" + file /oname=NetSurf.ico "frontends\windows\res\NetSurf.ico" + file /oname=default.css "frontends\windows\res\default.css" + file /oname=internal.css "frontends\windows\res\internal.css" + file /oname=adblock.css "frontends\windows\res\adblock.css" + file /oname=welcome.html "frontends\windows\res\welcome.html" + file /oname=credits.html "frontends\windows\res\credits.html" + file /oname=licence.html "frontends\windows\res\licence.html" + file /oname=netsurf.png "frontends\windows\res\netsurf.png" file /oname=messages "build-Linux-windows\messages" - file /oname=ca-bundle.crt "windows\res\ca-bundle.crt" + file /oname=ca-bundle.crt "frontends\windows\res\ca-bundle.crt" # Add any other files for the install directory (license files, app data, etc) here # Uninstaller - See function un.onInit and section "uninstall" for configuration diff --git a/frontends/windows/res/internal.css b/frontends/windows/res/internal.css new file mode 120000 index 000000000..17f9f1504 --- /dev/null +++ b/frontends/windows/res/internal.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/frontends/windows/res/licence.html b/frontends/windows/res/licence.html new file mode 120000 index 000000000..147dd6db2 --- /dev/null +++ b/frontends/windows/res/licence.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/licence.html,faf \ No newline at end of file diff --git a/windows/res/netsurf.gif b/frontends/windows/res/netsurf.gif similarity index 100% rename from windows/res/netsurf.gif rename to frontends/windows/res/netsurf.gif diff --git a/frontends/windows/res/netsurf.png b/frontends/windows/res/netsurf.png new file mode 120000 index 000000000..905512c25 --- /dev/null +++ b/frontends/windows/res/netsurf.png @@ -0,0 +1 @@ +../../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/frontends/windows/res/quirks.css b/frontends/windows/res/quirks.css new file mode 120000 index 000000000..88aabe48c --- /dev/null +++ b/frontends/windows/res/quirks.css @@ -0,0 +1 @@ +../../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/windows/res/resource.rc b/frontends/windows/res/resource.rc similarity index 100% rename from windows/res/resource.rc rename to frontends/windows/res/resource.rc diff --git a/windows/res/throbber.avi b/frontends/windows/res/throbber.avi similarity index 100% rename from windows/res/throbber.avi rename to frontends/windows/res/throbber.avi diff --git a/windows/res/throbber/throbber0.bmp b/frontends/windows/res/throbber/throbber0.bmp similarity index 100% rename from windows/res/throbber/throbber0.bmp rename to frontends/windows/res/throbber/throbber0.bmp diff --git a/windows/res/throbber/throbber0.png b/frontends/windows/res/throbber/throbber0.png similarity index 100% rename from windows/res/throbber/throbber0.png rename to frontends/windows/res/throbber/throbber0.png diff --git a/windows/res/throbber/throbber1.bmp b/frontends/windows/res/throbber/throbber1.bmp similarity index 100% rename from windows/res/throbber/throbber1.bmp rename to frontends/windows/res/throbber/throbber1.bmp diff --git a/windows/res/throbber/throbber1.png b/frontends/windows/res/throbber/throbber1.png similarity index 100% rename from windows/res/throbber/throbber1.png rename to frontends/windows/res/throbber/throbber1.png diff --git a/windows/res/throbber/throbber2.bmp b/frontends/windows/res/throbber/throbber2.bmp similarity index 100% rename from windows/res/throbber/throbber2.bmp rename to frontends/windows/res/throbber/throbber2.bmp diff --git a/windows/res/throbber/throbber2.png b/frontends/windows/res/throbber/throbber2.png similarity index 100% rename from windows/res/throbber/throbber2.png rename to frontends/windows/res/throbber/throbber2.png diff --git a/windows/res/throbber/throbber3.bmp b/frontends/windows/res/throbber/throbber3.bmp similarity index 100% rename from windows/res/throbber/throbber3.bmp rename to frontends/windows/res/throbber/throbber3.bmp diff --git a/windows/res/throbber/throbber3.png b/frontends/windows/res/throbber/throbber3.png similarity index 100% rename from windows/res/throbber/throbber3.png rename to frontends/windows/res/throbber/throbber3.png diff --git a/windows/res/throbber/throbber4.bmp b/frontends/windows/res/throbber/throbber4.bmp similarity index 100% rename from windows/res/throbber/throbber4.bmp rename to frontends/windows/res/throbber/throbber4.bmp diff --git a/windows/res/throbber/throbber4.png b/frontends/windows/res/throbber/throbber4.png similarity index 100% rename from windows/res/throbber/throbber4.png rename to frontends/windows/res/throbber/throbber4.png diff --git a/windows/res/throbber/throbber5.bmp b/frontends/windows/res/throbber/throbber5.bmp similarity index 100% rename from windows/res/throbber/throbber5.bmp rename to frontends/windows/res/throbber/throbber5.bmp diff --git a/windows/res/throbber/throbber5.png b/frontends/windows/res/throbber/throbber5.png similarity index 100% rename from windows/res/throbber/throbber5.png rename to frontends/windows/res/throbber/throbber5.png diff --git a/windows/res/throbber/throbber6.bmp b/frontends/windows/res/throbber/throbber6.bmp similarity index 100% rename from windows/res/throbber/throbber6.bmp rename to frontends/windows/res/throbber/throbber6.bmp diff --git a/windows/res/throbber/throbber6.png b/frontends/windows/res/throbber/throbber6.png similarity index 100% rename from windows/res/throbber/throbber6.png rename to frontends/windows/res/throbber/throbber6.png diff --git a/windows/res/throbber/throbber7.bmp b/frontends/windows/res/throbber/throbber7.bmp similarity index 100% rename from windows/res/throbber/throbber7.bmp rename to frontends/windows/res/throbber/throbber7.bmp diff --git a/windows/res/throbber/throbber7.png b/frontends/windows/res/throbber/throbber7.png similarity index 100% rename from windows/res/throbber/throbber7.png rename to frontends/windows/res/throbber/throbber7.png diff --git a/windows/res/throbber/throbber8.png b/frontends/windows/res/throbber/throbber8.png similarity index 100% rename from windows/res/throbber/throbber8.png rename to frontends/windows/res/throbber/throbber8.png diff --git a/windows/res/toolbar.bmp b/frontends/windows/res/toolbar.bmp similarity index 100% rename from windows/res/toolbar.bmp rename to frontends/windows/res/toolbar.bmp diff --git a/windows/res/toolbarg.bmp b/frontends/windows/res/toolbarg.bmp similarity index 100% rename from windows/res/toolbarg.bmp rename to frontends/windows/res/toolbarg.bmp diff --git a/windows/res/toolbarh.bmp b/frontends/windows/res/toolbarh.bmp similarity index 100% rename from windows/res/toolbarh.bmp rename to frontends/windows/res/toolbarh.bmp diff --git a/frontends/windows/res/welcome.html b/frontends/windows/res/welcome.html new file mode 120000 index 000000000..28362130a --- /dev/null +++ b/frontends/windows/res/welcome.html @@ -0,0 +1 @@ +../../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file diff --git a/windows/resourceid.h b/frontends/windows/resourceid.h similarity index 100% rename from windows/resourceid.h rename to frontends/windows/resourceid.h diff --git a/windows/schedule.c b/frontends/windows/schedule.c similarity index 100% rename from windows/schedule.c rename to frontends/windows/schedule.c diff --git a/windows/schedule.h b/frontends/windows/schedule.h similarity index 100% rename from windows/schedule.h rename to frontends/windows/schedule.h diff --git a/windows/windbg.c b/frontends/windows/windbg.c similarity index 100% rename from windows/windbg.c rename to frontends/windows/windbg.c diff --git a/windows/windbg.h b/frontends/windows/windbg.h similarity index 100% rename from windows/windbg.h rename to frontends/windows/windbg.h diff --git a/windows/window.c b/frontends/windows/window.c similarity index 100% rename from windows/window.c rename to frontends/windows/window.c diff --git a/windows/window.h b/frontends/windows/window.h similarity index 100% rename from windows/window.h rename to frontends/windows/window.h diff --git a/gtk/res/SearchEngines b/gtk/res/SearchEngines deleted file mode 120000 index df5252e07..000000000 --- a/gtk/res/SearchEngines +++ /dev/null @@ -1 +0,0 @@ -../../resources/SearchEngines \ No newline at end of file diff --git a/gtk/res/adblock.css b/gtk/res/adblock.css deleted file mode 120000 index e3811f62b..000000000 --- a/gtk/res/adblock.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/gtk/res/ca-bundle.txt b/gtk/res/ca-bundle.txt deleted file mode 120000 index ad2dd6b55..000000000 --- a/gtk/res/ca-bundle.txt +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/ca-bundle \ No newline at end of file diff --git a/gtk/res/de/welcome.html b/gtk/res/de/welcome.html deleted file mode 120000 index b2ddfc796..000000000 --- a/gtk/res/de/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/de/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/default.css b/gtk/res/default.css deleted file mode 120000 index 6d2d4da5b..000000000 --- a/gtk/res/default.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/gtk/res/en/maps.html b/gtk/res/en/maps.html deleted file mode 120000 index bb1eedd5a..000000000 --- a/gtk/res/en/maps.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/en/maps.html,faf \ No newline at end of file diff --git a/gtk/res/icons b/gtk/res/icons deleted file mode 120000 index 509ccd1d2..000000000 --- a/gtk/res/icons +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/Icons/ \ No newline at end of file diff --git a/gtk/res/internal.css b/gtk/res/internal.css deleted file mode 120000 index e777d8ae1..000000000 --- a/gtk/res/internal.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/gtk/res/it/credits.html b/gtk/res/it/credits.html deleted file mode 120000 index 6e1e15ed5..000000000 --- a/gtk/res/it/credits.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/it/credits.html,faf \ No newline at end of file diff --git a/gtk/res/it/licence.html b/gtk/res/it/licence.html deleted file mode 120000 index 3a7c056b6..000000000 --- a/gtk/res/it/licence.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/it/licence.html,faf \ No newline at end of file diff --git a/gtk/res/it/welcome.html b/gtk/res/it/welcome.html deleted file mode 120000 index dea1e839c..000000000 --- a/gtk/res/it/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/it/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/ja/welcome.html b/gtk/res/ja/welcome.html deleted file mode 120000 index 827796f02..000000000 --- a/gtk/res/ja/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/ja/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/netsurf.png b/gtk/res/netsurf.png deleted file mode 120000 index 0fbf42709..000000000 --- a/gtk/res/netsurf.png +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/gtk/res/nl/credits.html b/gtk/res/nl/credits.html deleted file mode 120000 index 8aed84c84..000000000 --- a/gtk/res/nl/credits.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/nl/credits.html,faf \ No newline at end of file diff --git a/gtk/res/nl/licence.html b/gtk/res/nl/licence.html deleted file mode 120000 index 937875557..000000000 --- a/gtk/res/nl/licence.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/nl/licence.html,faf \ No newline at end of file diff --git a/gtk/res/nl/welcome.html b/gtk/res/nl/welcome.html deleted file mode 120000 index 05874d241..000000000 --- a/gtk/res/nl/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../../!NetSurf/Resources/nl/welcome.html,faf \ No newline at end of file diff --git a/gtk/res/quirks.css b/gtk/res/quirks.css deleted file mode 120000 index d9fb80334..000000000 --- a/gtk/res/quirks.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/gtk/res/favicon.png b/resources/favicon.png similarity index 100% rename from gtk/res/favicon.png rename to resources/favicon.png diff --git a/windows/res/adblock.css b/windows/res/adblock.css deleted file mode 120000 index e3811f62b..000000000 --- a/windows/res/adblock.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/AdBlock,f79 \ No newline at end of file diff --git a/windows/res/ca-bundle.crt b/windows/res/ca-bundle.crt deleted file mode 120000 index ad2dd6b55..000000000 --- a/windows/res/ca-bundle.crt +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/ca-bundle \ No newline at end of file diff --git a/windows/res/credits.html b/windows/res/credits.html deleted file mode 120000 index db395bb5a..000000000 --- a/windows/res/credits.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/credits.html,faf \ No newline at end of file diff --git a/windows/res/default.css b/windows/res/default.css deleted file mode 120000 index 6d2d4da5b..000000000 --- a/windows/res/default.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/CSS,f79 \ No newline at end of file diff --git a/windows/res/internal.css b/windows/res/internal.css deleted file mode 120000 index e777d8ae1..000000000 --- a/windows/res/internal.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/internal.css,f79 \ No newline at end of file diff --git a/windows/res/licence.html b/windows/res/licence.html deleted file mode 120000 index a5f990304..000000000 --- a/windows/res/licence.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/licence.html,faf \ No newline at end of file diff --git a/windows/res/netsurf.png b/windows/res/netsurf.png deleted file mode 120000 index 0fbf42709..000000000 --- a/windows/res/netsurf.png +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/netsurf.png,b60 \ No newline at end of file diff --git a/windows/res/quirks.css b/windows/res/quirks.css deleted file mode 120000 index d9fb80334..000000000 --- a/windows/res/quirks.css +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/Quirks,f79 \ No newline at end of file diff --git a/windows/res/welcome.html b/windows/res/welcome.html deleted file mode 120000 index 5b394445b..000000000 --- a/windows/res/welcome.html +++ /dev/null @@ -1 +0,0 @@ -../../!NetSurf/Resources/en/welcome.html,faf \ No newline at end of file