Commit 8d29a8c1 authored by ROOL's avatar ROOL 🤖
Browse files

This commit was manufactured by cvs2git to create tag 'dcotton_autobuild_BaseSW'.

Sprout from master 1999-11-03 14:21:38 UTC John Beranek <jberanek@gitlab.riscosopen.org> '  Merged Ursula and Spinner branches.'
Cherrypick from master 2001-07-11 11:15:00 UTC Stewart Brodie <sbrodie@gitlab.riscosopen.org> '  Builds with OSLib 4 or OSLib 6':
    !Mk,fd7
    !MkClean,fd7
    !MkExport,fd7
    !MkInstall,fd7
    !MkRom,fd7
    Makefile
    Resources/perlscript
    Support011/c/task
    VersionNum
    c/cmyk
    c/dialogue
    c/hsv
    c/main
    c/rgb
    cmhg/header
    h/files
    s/veneer
Cherrypick from master 1999-11-24 15:38:09 UTC Stewart Brodie <sbrodie@gitlab.riscosopen.org> 'Missed out this file in previous checkin':
    s/muldiv
Cherrypick from StrongARM 1996-11-06 02:50:28 UTC Neil Turton <nturton@gitlab.riscosopen.org> 'Import from cleaned 370 CD':
    Support011/!Make,fd7
    Support011/README
    Support011/asm/muldiv
    Support011/asm/svc
    Support011/c/applicatio
    Support011/c/bezierarc
    Support011/c/box
    Support011/c/callback
    Support011/c/co
    Support011/c/compl
    Support011/c/flex
    Support011/c/icon
    Support011/c/lookup
    Support011/c/m
    Support011/c/realloc
    Support011/c/relocate
    Support011/c/resource
    Support011/c/riscos
    Support011/c/steppable
    Support011/c/trace
    Support011/c/trfm
    Support011/c/window
    Support011/c/x
    Support011/def/Advance
    Support011/def/DDEUtils
    Support011/def/EMail
    Support011/def/EtherA
    Support011/def/FrontEnd
    Support011/def/HostFS
    Support011/def/MakePSFont
    Support011/def/NFS
    Support011/def/SCSI
    Support011/def/SCSIFS
    Support011/def/Socket
    Support011/def/Spell
    Support011/doc/!Dir,feb
    Support011/doc/c/ex0
    Support011/doc/c/ex1
    Support011/doc/c/ex2
    Support011/doc/callback
    Support011/doc/hash
    Support011/doc/icon
    Support011/doc/lookup
    Support011/doc/muldiv
    Support011/doc/nonx
    Support011/doc/realloc
    Support011/doc/relocate
    Support011/doc/resource
    Support011/doc/riscos
    Support011/doc/s/ex0
    Support011/doc/s/ex1
    Support011/doc/s/ex2
    Support011/doc/steppable
    Support011/doc/trace
    Support011/doc/trfm
    Support011/doc/x
    Support011/h/applicatio
    Support011/h/bezierarc
    Support011/h/box
    Support011/h/callback
    Support011/h/co
    Support011/h/compl
    Support011/h/flex
    Support011/h/icon
    Support011/h/lookup
    Support011/h/m
    Support011/h/muldiv
    Support011/h/realloc
    Support011/h/relocate
    Support011/h/resource
    Support011/h/riscos
    Support011/h/steppable
    Support011/h/svc
    Support011/h/task
    Support011/h/trace
    Support011/h/trfm
    Support011/h/window
    Support011/h/x
    Support011/o
parent 30e342c2
| Copyright 1999 Pace Micro Technology plc
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
Wimpslot 5000K
amu_machine all THROWBACK=-throwback -D
| Copyright 1999 Pace Micro Technology plc
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
| Copyright 1999 Pace Micro Technology plc
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine export
| Copyright 1999 Pace Micro Technology plc
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine install_rom INSTDIR=<Install$Dir>
| Copyright 1999 Pace Micro Technology plc
|
| Licensed under the Apache License, Version 2.0 (the "License");
| you may not use this file except in compliance with the License.
| You may obtain a copy of the License at
|
| http://www.apache.org/licenses/LICENSE-2.0
|
| Unless required by applicable law or agreed to in writing, software
| distributed under the License is distributed on an "AS IS" BASIS,
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
| See the License for the specific language governing permissions and
| limitations under the License.
|
Dir <Obey$Dir>
wimpslot 5000k
amu_machine rom
hdr/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
**/hdr/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
**/s/** gitlab-language=armasm linguist-language=armasm linguist-detectable=true
c/** gitlab-language=c linguist-language=c linguist-detectable=true
**/c/** gitlab-language=c linguist-language=c linguist-detectable=true
......
# Copyright 1999 Pace Micro Technology plc
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Makefile for ColourPicker
#
# ***********************************
# *** C h a n g e L i s t ***
# ***********************************
# Date Name Description
# ---- ---- -----------
# 23-Nov-99 SNB Created
COMPONENT = Picker
RAM_MODULE = rm.${COMPONENT}
ROM_MODULE = aof.${COMPONENT}
DBG_MODULE = rm.${COMPONENT}D
FULL_COMPONENT = ColourPicker
#
# Paths
#
EXP_HDR = <export$dir>
VPATH=@ Support011
#
# Export Paths for Messages module
#
RESDIR = <resource$dir>.Resources2.${COMPONENT}
RESFSDIR = Resources.${COMPONENT}
#
# Generic options:
#
MKDIR = do mkdir -p
AS = objasm
CC = cc
CMHG = cmhg
CP = copy
LD = link
RM = remove
MODSQZ = modsqz
WIPE = -wipe
CD = dir
TOUCH = stamp
WINEDIT = /Apps:!WinEdit
CPFLAGS = ~cfr~v
WFLAGS = f~c~vr
#
# Include files
#
INCLUDES= -IC:AsmUtils,Support011,icons,OS:,C:
#
# Libraries
#
CLIB = Clib:o.Stubs
ROMCSTUBS = RISCOSLIB:o.romcstubs
ABSSYM = RISC_OSLib:o.AbsSym
OSLIB = OSLib:o.OSLib
ASMUTILS = C:AsmUtils.o.AsmUtilsZM
DEPEND = -depend !Depend
DBGFLAGS = -DTRACE
DEFINES =
CENV = ${DEPEND} ${THROWBACK}
ASFLAGS = ${DEPEND} ${THROWBACK}
CFLAGS = -W -c -ffh -zM -zps1 -Wcp ${INCLUDES} ${DEFINES} ${CENV}
CMHGFLAGS = ${DEPEND} ${THROWBACK} -p
OTHER_OBJS = o.veneer o.header
ROM_OBJS = or.cmyk or.dialogue or.helpreply or.hsv \
or.main or.model or.rgb or.tables \
or.callback or.lookup or.realloc \
or.task or.riscos or.window or.resource \
or.icon or.steppable or.relocate ${OTHER_OBJS}
RAM_OBJS = o.cmyk o.dialogue o.helpreply o.hsv \
o.main o.model o.rgb o.tables ${RESF} \
o.callback o.lookup o.realloc \
o.task o.riscos o.window o.resource \
o.icon o.steppable o.relocate ${OTHER_OBJS}
DBG_OBJS = od.cmyk od.dialogue od.helpreply od.hsv \
od.main od.model od.rgb od.tables ${RESF} \
od.m od.callback od.lookup od.realloc \
od.task od.riscos od.window od.resource \
od.icon od.steppable od.relocate ${OTHER_OBJS}
RESF = o.msgs
RESOURCEFILES = \
Resources.CMYK.Messages\
Resources.CMYK.Templates\
Resources.HSV.Messages\
Resources.HSV.Templates\
Resources.RGB.Messages\
Resources.RGB.Templates\
Resources.Messages\
Resources.Sprites\
Resources.Templates
#
# Rule patterns
#
.SUFFIXES: .o .od .or .s .c .cmhg .h
.c.o:; ${CC} ${CFLAGS} -o $@ $<
.c.or:; ${CC} ${CFLAGS} -DROM -o $@ $<
.c.od:; ${CC} ${CFLAGS} ${DBGFLAGS} -o $@ $<
.cmhg.o:; ${CMHG} ${CMHGFLAGS} -o $@ $< -d h.header
.cmhg.h:; ${CMHG} ${CMHGFLAGS} -d $@ $< -o null:
.cmhg.od:; ${CMHG} ${CMHGFLAGS} -o $@ $< -d h.header ${DBGFLAGS}
.s.o:; ${AS} ${ASFLAGS} -o $@ $<
header.h: header.o
${TOUCH} $@
o.header od.header: VersionNum
ICONS=icons.h.dialogue_i icons.h.cmyk_i icons.h.rgb_i icons.h.hsv_i
icons.h.dialogue_i: Resources.Templates
${WINEDIT} "-h??=define dialogue_%w_%n ((wimp_i) %i)" Resources.Templates >$@
perl Resources.perlscript $@
icons.h.cmyk_i: Resources.CMYK.Templates
${WINEDIT} "-h??=define cmyk_%w_%n ((wimp_i) %i)" Resources.CMYK.Templates >$@
perl Resources.perlscript $@
icons.h.rgb_i: Resources.RGB.Templates
${WINEDIT} "-h??=define rgb_%w_%n ((wimp_i) %i)" Resources.RGB.Templates >$@
perl Resources.perlscript $@
icons.h.hsv_i: Resources.HSV.Templates
${WINEDIT} "-h??=define hsv_%w_%n ((wimp_i) %i)" Resources.HSV.Templates >$@
perl Resources.perlscript $@
#
# Main rules:
#
#
all: ${RAM_MODULE} o.dirs
@echo ${FULL_COMPONENT}: Module built (RAM)
ramtrace: ${DBG_MODULE} o.dirs
@echo ${FULL_COMPONENT}: Module built (TRACE)
rom: ${ROM_MODULE} o.dirs
@echo ${FULL_COMPONENT}: Module built (ROM)
install_rom: ${ROM_MODULE}
${CP} ${ROM_MODULE} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${FULL_COMPONENT}: Module installed (ROM)
resources: ${RESOURCEFILES}
${MKDIR} ${RESDIR}
${MKDIR} ${RESDIR}.CMYK
${MKDIR} ${RESDIR}.HSV
${MKDIR} ${RESDIR}.RGB
${CP} Resources.CMYK.Messages ${RESDIR}.CMYK.Messages ${CPFLAGS}
${CP} Resources.CMYK.Templates ${RESDIR}.CMYK.Templates ${CPFLAGS}
${CP} Resources.HSV.Templates ${RESDIR}.HSV.Templates ${CPFLAGS}
${CP} Resources.HSV.Messages ${RESDIR}.HSV.Messages ${CPFLAGS}
${CP} Resources.RGB.Templates ${RESDIR}.RGB.Templates ${CPFLAGS}
${CP} Resources.RGB.Messages ${RESDIR}.RGB.Messages ${CPFLAGS}
${CP} Resources.Messages ${RESDIR}.Messages ${CPFLAGS}
${CP} Resources.Sprites ${RESDIR}.Sprites ${CPFLAGS}
${CP} Resources.Templates ${RESDIR}.Templates ${CPFLAGS}
@echo ${FULL_COMPONENT}: resource files copied to Messages module
clean:
${WIPE} o ${WFLAGS}
${WIPE} od ${WFLAGS}
${WIPE} or ${WFLAGS}
${WIPE} aof ${WFLAGS}
${WIPE} rm ${WFLAGS}
${WIPE} h.header ${WFLAGS}
${WIPE} linked ${WFLAGS}
${WIPE} icons ${WFLAGS}
@echo ${FULL_COMPONENT}: cleaned
o.dirs:
${MKDIR} o
${MKDIR} od
${MKDIR} or
${MKDIR} icons
${MKDIR} icons.h
create $@
export:
${CP} hdr.ColourPick ${EXP_HDR}.ColourPick ${CPFLAGS}
@echo ${FULL_COMPONENT}: export complete
#
# Targets
#
${RAM_MODULE}: ${RAM_OBJS} ${CLIB} ${OSLIB} ${ICONS} ${ASMUTILS}
${MKDIR} rm
$(LD) -o $@ -rmf ${RAM_OBJS} ${CLIB} ${OSLIB} ${ASMUTILS}
${MODSQZ} $@
Access $@ RW/R
${ROM_MODULE}: ${ROM_OBJS} ${OSLIB} ${ROMCSTUBS} ${ICONS} ${ASMUTILS}
${MKDIR} aof
$(LD) -o $@ -aof ${ROM_OBJS} ${OSLIB} ${ROMCSTUBS} ${ASMUTILS}
${DBG_MODULE}: ${DBG_OBJS} ${CLIB} ${OSLIB} ${ICONS} ${ASMUTILS}
${MKDIR} rm
$(LD) -o $@ -rmf ${DBG_OBJS} ${OSLIB} ${CLIB} ${ASMUTILS}
Access $@ RW/R
${RESF}: ${RESOURCEFILES}
resgen resourcefs_files $@ \
Resources.CMYK.Messages ${RESFSDIR}.CMYK.Messages \
Resources.CMYK.Templates ${RESFSDIR}.CMYK.Templates \
Resources.HSV.Templates ${RESFSDIR}.HSV.Templates \
Resources.HSV.Messages ${RESFSDIR}.HSV.Messages \
Resources.RGB.Templates ${RESFSDIR}.RGB.Templates \
Resources.RGB.Messages ${RESFSDIR}.RGB.Messages \
Resources.Messages ${RESFSDIR}.Messages \
Resources.Sprites ${RESFSDIR}.Sprites \
Resources.Templates ${RESFSDIR}.Templates
#
# Final link for the ROM Image (using given base address)
#
rom_link:
${MKDIR} linked
${LD} -o linked.${COMPONENT} -rmf -base ${ADDRESS} ${ROM_MODULE} ${ABSSYM}
${CP} linked.${COMPONENT} ${LINKDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom_link complete
# Dynamic dependencies:
#!/usr/local/bin/perl
$F=shift(@ARGV);
die "Syntax: perlscript filename\n" unless $F;
# Replace the trigraphs in the input file
open(DATA, $F) || die "Unable to open $F\n";
@data=<DATA>;
close DATA;
open(DATA, '>'.$F) || die "Unable to open $F for writing\n";
for $i (@data) {
$i =~ s/\A\?\?\=/#/;
print DATA $i;
}
close <DATA>;
exit 0;
......@@ -37,6 +37,10 @@
#include "task.h"
#include "trace.h"
/* Support for building with OSLib 4 or OSLib 6 */
#ifndef message_PREQUIT
#define message_PREQUIT message_PRE_QUIT
#endif
/*
* (ADH 03/11/1998) MASK_ALL used to consist of the
......
/* (0.42)
/* (0.48)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.42
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 03 Nov 1999
#define Module_MajorVersion_CMHG 0.48
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 11 Jul 2001
#define Module_MajorVersion "0.42"
#define Module_Version 42
#define Module_MinorVersion ""
#define Module_Date "03 Nov 1999"
#define Module_MajorVersion "0.48"
#define Module_Version 48
#define Module_MinorVersion ""
#define Module_Date "11 Jul 2001"
#define Module_FullVersion "0.42"
#define Module_ApplicationDate2 "11-Jul-01"
#define Module_ApplicationDate4 "11-Jul-2001"
#define Module_ComponentName "Picker"
#define Module_ComponentPath "RiscOS/Sources/Video/UserI/Picker"
#define Module_FullVersion "0.48"
#define Module_HelpVersion "0.48 (11 Jul 2001)"
......@@ -998,9 +998,6 @@ os_error *cmyk_initialise (char *tail, int podule_base,
{ os_error *error = NULL;
bool done_messages = FALSE, done_templates = FALSE;
#ifdef STANDALONE
bool registered_messages = FALSE, registered_templates = FALSE;
#endif
NOT_USED (tail)
NOT_USED (podule_base)
......@@ -1008,26 +1005,8 @@ os_error *cmyk_initialise (char *tail, int podule_base,
tracef ("cmyk_initialise\n");
if (getenv ("ColourPicker$Path") == NULL)
{ Message_File_Name = "Resources:Resources.Picker.CMYK.Messages";
Template_File_Name = "Resources:Resources.Picker.CMYK.Templates";
}
else
{ Message_File_Name = "ColourPicker:CMYK.Messages";
Template_File_Name = "ColourPicker:CMYK.Templates";
}
#ifdef STANDALONE
if ((error = xresourcefs_register_files (files_cmyk_messages ())) !=
NULL)
goto finish;
registered_messages = TRUE;
if ((error = xresourcefs_register_files (files_cmyk_templates ())) !=
NULL)
goto finish;
registered_templates = TRUE;
#endif
Message_File_Name = "ColourPicker:CMYK.Messages";
Template_File_Name = "ColourPicker:CMYK.Templates";
/*Load files.*/
tracef ("cmyk_initialise: loading messages\n");
......@@ -1082,22 +1061,6 @@ finish:
&resource_templates_free);
if (error == NULL) error = error1;
}
#ifdef STANDALONE
if (registered_messages)
{ os_error *error1;
error1 = xresourcefs_deregister_files (files_cmyk_messages ());
if (error == NULL) error = error1;
}
if (registered_templates)
{ os_error *error1;
error1 = xresourcefs_deregister_files (files_cmyk_templates ());
if (error == NULL) error = error1;
}
#endif
}
return error;
......@@ -1119,14 +1082,6 @@ os_error *cmyk_terminate (bool fatal, int instance, void *workspace)
error1 = main_resource_free (cmyk_templates, &resource_templates_free);
if (error == NULL) error = error1;
#ifdef STANDALONE
error1 = xresourcefs_deregister_files (files_cmyk_messages ());
if (error == NULL) error = error1;
error1 = xresourcefs_deregister_files (files_cmyk_templates ());
if (error == NULL) error = error1;
#endif
if (error != NULL)
tracef ("ERROR: %s (error 0x%X)\n" _ error->errmess _ error->errnum);
return error;
......
......@@ -1295,7 +1295,11 @@ static os_error *Delete (dialogue_list l)
} }
tracef ("deleting main window\n");
#ifdef STANDALONE
#ifndef ROM
/* This is Service_WindowDeleted. Issued for the sole benefit of BorderUtils
* in RISC OS 3.1 to stop the Wimp dying when deleting a window containing
* an icon which is slabbed in.
*/
{
_kernel_swi_regs regs; /* NK 12.1.95 */
regs.r[0] = (int) l->main_w;
......
......@@ -1924,9 +1924,6 @@ os_error *hsv_initialise (char *tail, int podule_base,
{ os_error *error = NULL;
bool done_messages = FALSE, done_templates = FALSE;
bits flags;
#ifdef STANDALONE
bool registered_messages = FALSE, registered_templates = FALSE;
#endif
NOT_USED (tail)
NOT_USED (podule_base)
......@@ -1934,24 +1931,8 @@ os_error *hsv_initialise (char *tail, int podule_base,
tracef ("hsv_initialise\n");
if (getenv ("ColourPicker$Path") == NULL)
{ Message_File_Name = "Resources:Resources.Picker.HSV.Messages";
Template_File_Name = "Resources:Resources.Picker.HSV.Templates";
}
else
{ Message_File_Name = "ColourPicker:HSV.Messages";
Template_File_Name = "ColourPicker:HSV.Templates";
}
#ifdef STANDALONE
if ((error = xresourcefs_register_files (files_hsv_messages ())) != NULL)
goto finish;
registered_messages = TRUE;
if ((error = xresourcefs_register_files (files_hsv_templates ())) != NULL)
goto finish;
registered_templates = TRUE;
#endif
Message_File_Name = "ColourPicker:HSV.Messages";
Template_File_Name = "ColourPicker:HSV.Templates";
/*Load files.*/
tracef ("hsv_initialise: loading messages\n");
......@@ -2018,22 +1999,6 @@ finish:
&resource_templates_free);
if (error == NULL) error = error1;
}
#ifdef STANDALONE
if (registered_messages)
{ os_error *error1;
error1 = xresourcefs_deregister_files (files_hsv_messages ());
if (error == NULL) error = error1;
}
if (registered_templates)
{ os_error *error1;
error1 = xresourcefs_deregister_files (files_hsv_templates ());
if (error == NULL) error = error1;
}
#endif
}
return error;
......@@ -2055,14 +2020,6 @@ os_error *hsv_terminate (bool fatal, int instance, void *workspace)
error1 = main_resource_free (hsv_templates, &resource_templates_free);
if (error == NULL) error = error1;
#ifdef STANDALONE
error1 = xresourcefs_deregister_files (files_hsv_messages ());
if (error == NULL) error = error1;
error1 = xresourcefs_deregister_files (files_hsv_templates ());
if (error == NULL) error = error1;
#endif
error1 = tables_terminate ();
if (error == NULL) error = error1;
......
......@@ -100,9 +100,8 @@ _kernel_oserror *main_initialise (char *tail, int podule_base,
done_model = FALSE, done [COUNT (Initialise)] = {FALSE /*, ...*/},
done_dialogue = FALSE;
int i;
#ifdef STANDALONE
bool registered_messages = FALSE, registered_sprites = FALSE,
registered_templates = FALSE;
#ifndef ROM
bool registered_messages = FALSE;
#endif
#ifdef NEWTABLE
bool registered_table = FALSE;
......@@ -121,15 +120,11 @@ _kernel_oserror *main_initialise (char *tail, int podule_base,
tracef ("main_initialise: depth %d\n" _ Invocation_Depth);
if (getenv ("ColourPicker$Path") == NULL)
{ Message_File_Name = "Resources:Resources.Picker.Messages";
Sprite_File_Name = "Resources:Resources.Picker.Sprites";
Template_File_Name = "Resources:Resources.Picker.Templates";
}
else
{ Message_File_Name = "ColourPicker:Messages";
Sprite_File_Name = "ColourPicker:Sprites";
Template_File_Name = "ColourPicker:Templates";
}
_kernel_setenv("ColourPicker$Path", "Resources:$.Resources.Picker.");
Message_File_Name = "ColourPicker:Messages";
Sprite_File_Name = "ColourPicker:Sprites";
Template_File_Name = "ColourPicker:Templates";
#ifdef NEWTABLE
Table_File_Name = "Resources:Resources.Colours.Tables.4desktop";
#endif
......@@ -137,18 +132,10 @@ _kernel_oserror *main_initialise (char *tail, int podule_base,
if ((error = riscos_territory (territory_CURRENT)) != NULL)
goto finish;
#ifdef STANDALONE
if ((error = xresourcefs_register_files (files_messages ())) != NULL)
#ifndef ROM
if ((error = xresourcefs_register_files (resourcefs_files ())) != NULL)
goto finish;
registered_messages = TRUE;
if ((error = xresourcefs_register_files (files_sprites ())) != NULL)
goto finish;
registered_sprites = TRUE;
if ((error = xresourcefs_register_files (files_templates ())) != NULL)
goto finish;
registered_templates = TRUE;
#endif
#ifdef NEWTABLE
......@@ -276,25 +263,11 @@ finish:
}
#endif
#ifdef STANDALONE
#ifndef ROM
if (registered_messages)
{ os_error *error1;
error1 = xresourcefs_deregister_files (files_messages ());
if (error == NULL) error = error1;