Commit 2343ab03 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Merge of BuildSys-7_08 to branch

Version 6.00, 1.142.2.10. Tagged as 'BuildSys-6_00-1_142_2_10'
parent aa848488
...@@ -38,7 +38,7 @@ MakePSFont -type EXP ...@@ -38,7 +38,7 @@ MakePSFont -type EXP
# kernel is first module in ROM seen as the UtilityModule # kernel is first module in ROM seen as the UtilityModule
HAL_BCM2835 HAL_BCM2835
Kernel -at 0xFC010000 -options FREEZE_DEV_REL=TRUE ASFLAGS="-PD \"CMOS_Override SETS \\\"= FileLangCMOS,fsnumber_SDFS,CDROMFSCMOS,&C0\\\"\"" Kernel -at 0xFC010000 -options FREEZE_DEV_REL=TRUE ASFLAGS="-PD \"HiProcVecs SETL {FALSE}\" -PD \"CMOS_Override SETS \\\"= FileLangCMOS,fsnumber_SDFS,CDROMFSCMOS,&C0\\\"\""
Podule -type EXP Podule -type EXP
PCI PCI
FileSwitch FileSwitch
...@@ -82,7 +82,7 @@ Filer ...@@ -82,7 +82,7 @@ Filer
FilerSWIs FilerSWIs
FSLock FSLock
FontManager FontManager
FPEmulator -options FPE_APCS=3/32bit FPEANCHOR=High FPEmulator -options FPE_APCS=3/32bit
VFPSupport VFPSupport
Free Free
Hourglass Hourglass
...@@ -189,6 +189,7 @@ CDFSFiler ...@@ -189,6 +189,7 @@ CDFSFiler
UnSqzAIF UnSqzAIF
InetRes -options TYPE=EmergencyUtils InetRes -options TYPE=EmergencyUtils
GPIO
HeroNames HeroNames
# some libraries and bits # some libraries and bits
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# #
HdrSrc -type EXP HdrSrc -type EXP
BufferManager -type EXP BufferManager -type EXP
ColourPicker -type EXP
ColourTrans -type EXP ColourTrans -type EXP
DragASprite -type EXP DragASprite -type EXP
FileSwitch -type EXP FileSwitch -type EXP
......
...@@ -50,6 +50,7 @@ TaskManager ...@@ -50,6 +50,7 @@ TaskManager
# Desktop is the 11th module (default language) # Desktop is the 11th module (default language)
Desktop Desktop
SharedRISC_OSLib SharedRISC_OSLib
ScreenModes
GC320Video GC320Video
BASIC105 BASIC105
BASIC64 BASIC64
...@@ -129,7 +130,6 @@ SDIODriver ...@@ -129,7 +130,6 @@ SDIODriver
SDFS SDFS
SDFSFiler -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes SDFSFiler -options ASFLAGS="-PD \"SDFS SETL {TRUE}\"" TEMPLATES=yes
ColourPicker ColourPicker
ScreenModes
DrawFile DrawFile
BootCommands BootCommands
AUNMsgs AUNMsgs
......
...@@ -54,10 +54,10 @@ WindowManager -options OPTIONS=Ursula ...@@ -54,10 +54,10 @@ WindowManager -options OPTIONS=Ursula
# so put the desktop module here as module 11 # so put the desktop module here as module 11
Desktop Desktop
# #
ScreenModes
IMXVideo IMXVideo
TaskManager TaskManager
FPEmulator -options FPE_APCS=3/32bit FPEANCHOR=High FPEmulator -options FPE_APCS=3/32bit FPEANCHOR=High
ScreenModes
BASIC105 BASIC105
BASIC64 BASIC64
BufferManager BufferManager
......
...@@ -5,19 +5,19 @@ ...@@ -5,19 +5,19 @@
* *
*/ */
#define Module_MajorVersion_CMHG 6.00 #define Module_MajorVersion_CMHG 6.00
#define Module_MinorVersion_CMHG 1.142.2.9 #define Module_MinorVersion_CMHG 1.142.2.10
#define Module_Date_CMHG 21 Feb 2017 #define Module_Date_CMHG 15 Apr 2017
#define Module_MajorVersion "6.00" #define Module_MajorVersion "6.00"
#define Module_Version 600 #define Module_Version 600
#define Module_MinorVersion "1.142.2.9" #define Module_MinorVersion "1.142.2.10"
#define Module_Date "21 Feb 2017" #define Module_Date "15 Apr 2017"
#define Module_ApplicationDate "21-Feb-17" #define Module_ApplicationDate "15-Apr-17"
#define Module_ComponentName "BuildSys" #define Module_ComponentName "BuildSys"
#define Module_ComponentPath "castle/RiscOS/BuildSys" #define Module_ComponentPath "castle/RiscOS/BuildSys"
#define Module_FullVersion "6.00 (1.142.2.9)" #define Module_FullVersion "6.00 (1.142.2.10)"
#define Module_HelpVersion "6.00 (21 Feb 2017) 1.142.2.9" #define Module_HelpVersion "6.00 (15 Apr 2017) 1.142.2.10"
#define Module_LibraryVersionInfo "6:0" #define Module_LibraryVersionInfo "6:0"
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