Commit 2b7fcbba authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Add support for "26" machine type. PlingSystem updates.

Detail:
  ImageName/SysMap - Add support for "26" machine type
  Components/ROOL/PlingSystem - Remove manual specification of All32 machine type for BASIC - would have resulted in code which isn't ARMv2 compatible. Remove 350 version of TaskWindow - the 310 version should be fine for all OS versions that PlingSystem targets. Document why SharedSnd is using the All machine type.
Admin:
  Tested with PlingSystem build


Version 6.90. Tagged as 'BuildSys-6_90'
parent dded7919
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# Fundamental components for header export... # Fundamental components for header export...
# #
HdrSrc -type EXP HdrSrc -type EXP
HdrSrc -type EXP -options MACHINE=Archimedes
HdrSrc -type EXP -options MACHINE=IOMD HdrSrc -type EXP -options MACHINE=IOMD
Kernel -type EXP Kernel -type EXP
...@@ -130,13 +131,18 @@ WindowManager -options INSTDIR=<Install$Dir>.System.!System.400.Module ...@@ -130,13 +131,18 @@ WindowManager -options INSTDIR=<Install$Dir>.System.!System.400.Module
# #
System -options INSTDIR=<Install$Dir>.System USERIF=None System -options INSTDIR=<Install$Dir>.System USERIF=None
AUNMsgs -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Network SYSTEM=PlingSystem AUNMsgs -options INSTDIR=<Install$Dir>.System.!System.310.Modules.Network SYSTEM=PlingSystem
BASIC105 -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None MACHINE=All32 TARGET=BASIC ROM_SOURCE=BASIC105.s BASIC105 -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None TARGET=BASIC ROM_SOURCE=BASIC105.s
BASIC64 -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None MACHINE=All32 BASIC64 -options INSTDIR=<Install$Dir>.System.!System.310.Modules CMDHELP=None
DragASprite -options INSTDIR=<Install$Dir>.System.!System.310.Modules DragASprite -options INSTDIR=<Install$Dir>.System.!System.310.Modules
DragAnObj -options INSTDIR=<Install$Dir>.System.!System.310.Modules DragAnObj -options INSTDIR=<Install$Dir>.System.!System.310.Modules
RedrawManager -options INSTDIR=<Install$Dir>.System.!System.310.Modules RedrawManager -options INSTDIR=<Install$Dir>.System.!System.310.Modules
# There is no technical need for SharedSnd to be built for MACHINE=All.
# However building for All has benefits for users of old versions of RISC OS 5
# (current RO 5 disc image doesn't include the module), and also for RISC OS 5
# RiscPC users without 16bit sound (doLog is only supported for softload
# versions of the module).
SharedSnd -options INSTDIR=<Install$Dir>.System.!System.310.Modules MACHINE=All ASFLAGS="-PD \"doLog SETL {TRUE}\"" SharedSnd -options INSTDIR=<Install$Dir>.System.!System.310.Modules MACHINE=All ASFLAGS="-PD \"doLog SETL {TRUE}\""
TaskWindow -options INSTDIR=<Install$Dir>.System.!System.350.Modules CMDHELP=None MACHINE=All32
# #
# FPEmulators for processors and kernels of varying capability # FPEmulators for processors and kernels of varying capability
......
...@@ -40,6 +40,7 @@ Machine ...@@ -40,6 +40,7 @@ Machine
I:IOMD I:IOMD
M:MPT M:MPT
L:Lazarus L:Lazarus
2:26
3:32 3:32
R:Morris R:Morris
T:Tungsten T:Tungsten
......
/* (6.89) /* (6.90)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 6.89 #define Module_MajorVersion_CMHG 6.90
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 May 2016 #define Module_Date_CMHG 28 May 2016
#define Module_MajorVersion "6.89" #define Module_MajorVersion "6.90"
#define Module_Version 689 #define Module_Version 690
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "22 May 2016" #define Module_Date "28 May 2016"
#define Module_ApplicationDate "22-May-16" #define Module_ApplicationDate "28-May-16"
#define Module_ComponentName "BuildSys" #define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys" #define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.89" #define Module_FullVersion "6.90"
#define Module_HelpVersion "6.89 (22 May 2016)" #define Module_HelpVersion "6.90 (28 May 2016)"
#define Module_LibraryVersionInfo "6:89" #define Module_LibraryVersionInfo "6:90"
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