Skip to content

GitLab

Commit f4fe9155 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Makefile recreated from fragments 

Don't bother calling TinyStubs SWI since in ROM it does nothing, and the RAM versions haven't used it since ~1997.
Use module header constants generated from CMHG rather than hand made one.

Version 0.38. Tagged as 'Gadgets-0_38'
parent b38b4d62
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 115 deletions
!MkClean,fd7
View file @ f4fe9155
......@@ -13,5 +13,5 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine clean COMPONENT=TextGadget
stripdepnd Makefile
amu_machine clean
stripdepnd
!MkDebug,fd7 0 → 100644
View file @ f4fe9155
| Copyright 2015 Castle Technology Ltd
|
| 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 debug THROWBACK=-throwback
!MkRam,fd7
View file @ f4fe9155
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine all COMPONENT=TextGadget THROWBACK=-throwback
amu_machine standalone
!MkRom,fd7
View file @ f4fe9155
......@@ -13,4 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
amu_machine rom COMPONENT=TextGadget THROWBACK=-throwback
amu_machine rom
Makefile
View file @ f4fe9155
......@@ -12,39 +12,19 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Makefile for a Toolbox Object module
# Makefile for TextGadgets module
#
# $Id$
#
# Component specific options:
#
RAMMESSAGES = o.msgs
COMMON_OBJ = o.ModHdr o.glib o.glib3 o.MemMan o.riscos_uti o.Scrollbar \
o.ScrollList o.Sizes o.TextArea o.TextMan \
o.Font o.riscos_gra o.ScrollLisS o.TAsel_ven o.Utils ${WIMPLIB}
ROM_OBJS = o.mainROM ${COMMON_OBJ}
RAM_OBJS = o.main ${RAMMESSAGES} ${COMMON_OBJ}
DBG_OBJS = od.main ${RAMMESSAGES} od.ModHdr od.glib od.glib3 od.MemMan od.riscos_uti od.Scrollbar \
od.ScrollList od.Sizes od.TextArea od.TextMan \
od.Font od.riscos_gra od.ScrollLisS od.TAsel_ven od.Utils ${WIMPLIB}
#
# Get main rules
#
include C:tboxlibint.TboxMake
#
# Module specific rules:
#
resources: resources-messages
@echo ${COMPONENT}: resource files copied to Messages module
COMPONENT = Gadgets
TARGET ?= TextGadget
OBJS = glib glib3 main MemMan riscos_uti Scrollbar\
ScrollList Sizes TextArea TextMan Font riscos_gra\
ScrollLisS TAsel_ven Utils
CMHGDEPENDS = main
ROMCDEFINES = -DROM
CINCLUDES = -IC:tboxlibint,tbox:,C:
LIBS = ${TBOXINTLIB} ${WIMPLIB}
clean: toolbox-clean
@echo ${COMPONENT}: cleaned
include CModule
#---------------------------------------------------------------------------
# Dynamic dependencies:
VersionNum
View file @ f4fe9155
/* (0.37)
/* (0.38)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.37
#define Module_MajorVersion_CMHG 0.38
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Aug 2013
#define Module_Date_CMHG 18 Aug 2015
#define Module_MajorVersion "0.37"
#define Module_Version 37
#define Module_MajorVersion "0.38"
#define Module_Version 38
#define Module_MinorVersion ""
#define Module_Date "30 Aug 2013"
#define Module_Date "18 Aug 2015"
#define Module_ApplicationDate "30-Aug-13"
#define Module_ApplicationDate "18-Aug-15"
#define Module_ComponentName "Gadgets"
#define Module_ComponentPath "castle/RiscOS/Sources/Toolbox/Gadgets"
#define Module_FullVersion "0.37"
#define Module_HelpVersion "0.37 (30 Aug 2013)"
#define Module_LibraryVersionInfo "0:37"
#define Module_FullVersion "0.38"
#define Module_HelpVersion "0.38 (18 Aug 2015)"
#define Module_LibraryVersionInfo "0:38"
c/main
View file @ f4fe9155
......@@ -45,6 +45,8 @@
#include "ScrollLisP.h"
#include "ScrollbarP.h"
#include "TextGadgetHdr.h"
#ifdef MemCheck_MEMCHECK
#include "MemCheck:MemCheck.h"
#endif
......@@ -71,10 +73,8 @@ int filter_wimp_events[] =
-1
};
#ifdef ROM
static _kernel_oserror *__ROM;
#else
extern int messages_file(void);
#ifndef ROM
extern int Resources(void);
#endif
/* convert work area coords to screen coords */
......@@ -145,10 +145,6 @@ _kernel_oserror *TextGadgets_init(const char *cmd_tail, int podule_base, void *p
IGNORE(podule_base);
IGNORE(pw);
#ifdef ROM
__ROM = _swix(0xa2c43, _IN(0), pw);
#endif
#ifdef MemCheck_MEMCHECK
MemCheck_InitNoDebug();
MemCheck_InterceptSCLStringFunctions();
......@@ -161,7 +157,7 @@ _kernel_oserror *TextGadgets_init(const char *cmd_tail, int podule_base, void *p
#ifndef ROM
/* Add the messages to ResourceFS */
if ((e = objmodule_register_resources(messages_file())) != NULL)
if ((e = objmodule_register_resources(Resources())) != NULL)
{
return e;
}
......@@ -186,7 +182,7 @@ failclose:
messages_file_close();
faildereg:
#ifndef ROM
objmodule_deregister_resources(messages_file());
objmodule_deregister_resources(Resources());
#endif
return e;
}
......@@ -212,7 +208,7 @@ void TextGadgets_services(int service_number, _kernel_swi_regs *r, void *pw)
#ifndef ROM
case Service_ResourceFSStarting:
(*(void (*)(int, void *, void *, void *))r->r[2])(messages_file(), 0, 0, (void *)r->r[3]);
(*(void (*)(int, void *, void *, void *))r->r[2])(Resources(), 0, 0, (void *)r->r[3]);
break;
#endif
default:
......@@ -244,17 +240,13 @@ _kernel_oserror *TextGadgets_final(int fatal, int podule, void *pw)
/* Close the messages (and deregister if not in ROM) */
messages_file_close();
#ifndef ROM
objmodule_deregister_resources(messages_file());
objmodule_deregister_resources(Resources());
#endif
#ifdef MemCheck_MEMCHECK
MemCheck_OutputBlocksInfo();
#endif
#ifdef ROM
if(!__ROM) _swix(0xa2c41, 0);
#endif
return NULL;
}
......
cmhg/ModHdr deleted 100644 → 0
View file @ b38b4d62
; Copyright 1997 Acorn Computers Ltd
;
; 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.
;
; Who Date Ver Description
; piers 03-07-97 0.01 Added shading to scrolllists, and changed look of
; textareas if built with -DDAYTONA_BUILD
; rlougher 0.05 Bug-fixes - lots of lovely data-aborts gone.
; rlougher 0.06 More bug-fixes.
; piers 19-01-98 0.07 Implemented dragging in Scrollbar gadget
; rlougher 20-01-98 0.08 Changed _insert_text to set caret to last position
; and force window to scroll. Changes to set_caret to
; allow invisibility.
; piers 30-01-98 0.09 Fixed dragging scrollbars (occasional div. by zero)
; sbrodie 04-06-98 0.10 Added extra flag to ScrollList selection event for adjust clicks
; plus switched to srccommit format.
; Daytona branch modifications
; Who Date Description
; piers 03-07-97 Added shading to scrolllists, and changed look of textareas
; if built with -DDAYTONA_BUILD
; mgr 1998-01-28 Merge in v0.06 from Spinner branch,
; add CLR functionality and tilde support,
; reinstate region select,
; and explicitly disallow Ctrl-I
; mgr 1998-02-27 Remove "d" from version
#include "VersionNum"
title-string: TextGadgets
help-string: TextGadgets Module_MajorVersion_CMHG Module_MinorVersion_CMHG
date-string: Module_Date_CMHG
initialisation-code: TextGadgets_init
finalisation-code: TextGadgets_final
swi-chunk-base-number: 0x140180
swi-handler-code: TextGadgets_SWI_handler
swi-decoding-table: TextGadgets,TextArea,TextField,ScrollList,Scrollbar,RedrawAll,Filter
; Services: 0x82881 Service_WindowModuleStarting
; 0x44EC6 Service_RedrawingWindow
; 0x60 Service_ResourceFSStarting
service-call-handler: TextGadgets_services 0x82881 0x44EC6 0x60
cmhg/TextGadgetHdr 0 → 100644
View file @ f4fe9155
; Copyright 2015 Castle Technology Ltd
;
; 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.
;
#include "VersionNum"
initialisation-code: TextGadgets_init
finalisation-code: TextGadgets_final
service-call-handler: TextGadgets_services 0x82881, 0x44EC6, 0x60
title-string: TextGadgets
help-string: TextGadgets Module_MajorVersion_CMHG
swi-chunk-base-number: 0x140180
swi-handler-code: TextGadgets_SWI_handler
swi-decoding-table: TextGadgets, TextArea, TextField, ScrollList, Scrollbar, RedrawAll, Filter
date-string: Module_Date_CMHG
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment