diff options
-rw-r--r-- | riscos/Makefile.target | 21 | ||||
-rw-r--r-- | riscos/bitmap.c | 2 | ||||
-rw-r--r-- | riscos/content-handlers/artworks.c (renamed from riscos/artworks.c) | 2 | ||||
-rw-r--r-- | riscos/content-handlers/artworks.h (renamed from riscos/artworks.h) | 0 | ||||
-rw-r--r-- | riscos/content-handlers/awrender.s (renamed from riscos/awrender.s) | 0 | ||||
-rw-r--r-- | riscos/content-handlers/draw.c (renamed from riscos/draw.c) | 2 | ||||
-rw-r--r-- | riscos/content-handlers/draw.h (renamed from riscos/draw.h) | 0 | ||||
-rw-r--r-- | riscos/content-handlers/sprite.c (renamed from riscos/sprite.c) | 2 | ||||
-rw-r--r-- | riscos/content-handlers/sprite.h (renamed from riscos/sprite.h) | 0 | ||||
-rw-r--r-- | riscos/gui.c | 6 | ||||
-rw-r--r-- | riscos/window.c | 2 |
11 files changed, 19 insertions, 18 deletions
diff --git a/riscos/Makefile.target b/riscos/Makefile.target index f7ba8d895..1008321ca 100644 --- a/riscos/Makefile.target +++ b/riscos/Makefile.target @@ -65,16 +65,17 @@ endif # ---------------------------------------------------------------------------- # S_RISCOS are sources purely for the RISC OS build -S_RISCOS := 401login.c artworks.c assert.c awrender.s bitmap.c buffer.c \ - cookies.c configure.c debugwin.c dialog.c download.c draw.c \ - filetype.c font.c global_history.c gui.c help.c history.c \ - hotlist.c iconbar.c image.c menus.c message.c palettes.c \ - plotters.c plugin.c print.c query.c save.c save_draw.c \ - save_pdf.c schedule.c search.c searchweb.c sprite.c sslcert.c \ - system_colour.c textarea.c textselection.c theme.c \ - theme_install.c thumbnail.c toolbar.c treeview.c ucstables.c \ - uri.c url_complete.c url_protocol.c url_suggest.c wimp.c \ - wimp_event.c window.c \ +S_RISCOS := 401login.c assert.c bitmap.c buffer.c cookies.c configure.c \ + debugwin.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 palettes.c plotters.c plugin.c \ + print.c query.c save.c save_draw.c save_pdf.c schedule.c \ + search.c searchweb.c sslcert.c system_colour.c textarea.c \ + textselection.c theme.c theme_install.c thumbnail.c toolbar.c \ + treeview.c ucstables.c uri.c url_complete.c url_protocol.c \ + url_suggest.c wimp.c wimp_event.c window.c \ + $(addprefix content-handlers/,artworks.c awrender.s draw.c \ + sprite.c) \ $(addprefix gui/,button_bar.c progress_bar.c status_bar.c \ throbber.c url_bar.c) \ $(addprefix configure/,con_cache.c con_connect.c con_content.c \ diff --git a/riscos/bitmap.c b/riscos/bitmap.c index 3d3c1216f..12198fe13 100644 --- a/riscos/bitmap.c +++ b/riscos/bitmap.c @@ -41,7 +41,7 @@ #include "riscos/image.h" #include "riscos/options.h" #include "riscos/palettes.h" -#include "riscos/sprite.h" +#include "riscos/content-handlers/sprite.h" #include "riscos/tinct.h" #include "utils/filename.h" #include "utils/log.h" diff --git a/riscos/artworks.c b/riscos/content-handlers/artworks.c index 8a25a3d47..a46a03010 100644 --- a/riscos/artworks.c +++ b/riscos/content-handlers/artworks.c @@ -34,7 +34,7 @@ #include "utils/config.h" #include "content/content_protected.h" #include "desktop/plotters.h" -#include "riscos/artworks.h" +#include "riscos/content-handlers/artworks.h" #include "riscos/gui.h" #include "riscos/wimputils.h" #include "utils/log.h" diff --git a/riscos/artworks.h b/riscos/content-handlers/artworks.h index 4a339cc84..4a339cc84 100644 --- a/riscos/artworks.h +++ b/riscos/content-handlers/artworks.h diff --git a/riscos/awrender.s b/riscos/content-handlers/awrender.s index 5bcafe520..5bcafe520 100644 --- a/riscos/awrender.s +++ b/riscos/content-handlers/awrender.s diff --git a/riscos/draw.c b/riscos/content-handlers/draw.c index 215070860..ccb9353cd 100644 --- a/riscos/draw.c +++ b/riscos/content-handlers/draw.c @@ -31,7 +31,7 @@ #include "utils/config.h" #include "content/content_protected.h" #include "desktop/plotters.h" -#include "riscos/draw.h" +#include "riscos/content-handlers/draw.h" #include "riscos/gui.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/riscos/draw.h b/riscos/content-handlers/draw.h index a0843202a..a0843202a 100644 --- a/riscos/draw.h +++ b/riscos/content-handlers/draw.h diff --git a/riscos/sprite.c b/riscos/content-handlers/sprite.c index 3e11e7f63..de65faca6 100644 --- a/riscos/sprite.c +++ b/riscos/content-handlers/sprite.c @@ -31,7 +31,7 @@ #include "desktop/plotters.h" #include "riscos/gui.h" #include "riscos/image.h" -#include "riscos/sprite.h" +#include "riscos/content-handlers/sprite.h" #include "utils/config.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/riscos/sprite.h b/riscos/content-handlers/sprite.h index 79e02f44b..79e02f44b 100644 --- a/riscos/sprite.h +++ b/riscos/content-handlers/sprite.h diff --git a/riscos/gui.c b/riscos/gui.c index 9d162f6f5..cc4470883 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -67,12 +67,12 @@ #include "render/box.h" #include "render/font.h" #include "render/html.h" -#include "riscos/artworks.h" +#include "riscos/content-handlers/artworks.h" #include "riscos/bitmap.h" #include "riscos/buffer.h" #include "riscos/cookies.h" #include "riscos/dialog.h" -#include "riscos/draw.h" +#include "riscos/content-handlers/draw.h" #include "riscos/global_history.h" #include "riscos/gui.h" #include "riscos/help.h" @@ -88,7 +88,7 @@ #include "riscos/query.h" #include "riscos/save.h" #include "riscos/sslcert.h" -#include "riscos/sprite.h" +#include "riscos/content-handlers/sprite.h" #include "riscos/system_colour.h" #include "riscos/textselection.h" #include "riscos/theme.h" diff --git a/riscos/window.c b/riscos/window.c index 5ad6db981..4fd5be9fa 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -72,7 +72,7 @@ #include "riscos/options.h" #include "riscos/oslib_pre7.h" #include "riscos/save.h" -#include "riscos/sprite.h" +#include "riscos/content-handlers/sprite.h" #include "riscos/toolbar.h" #include "riscos/thumbnail.h" #include "riscos/url_complete.h" |