Skip to content

GitLab

Commit 6de1e14c authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Merge of trunk BuildSys-6_34 to branch RPiFreeze 

Version 6.00, 1.142.2.4. Tagged as 'BuildSys-6_00-1_142_2_4'
parent 773ab6e8
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 12 deletions
Makefiles/GCCRules 0 → 100644
View file @ 6de1e14c
# Copyright 2013 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.
#
# Rules for using GCCSDK on RISC OS. Use in place of StdRules.
.SUFFIXES: .o .oz .s .c .h .c++ .cpp
# C source files -> object files
.c.o:
${CC} ${CFLAGS} -MD -MF !!Depend -o $@ $<
@${PERL} Build:GCCDepend $@
.c.oz:
${CC} ${CFLAGS} ${C_MODULE} -MD -MF !!Depend -o $@ $<
@${PERL} Build:GCCDepend $@
# C++ source files -> object files
.c++.o:
${C++} ${C++FLAGS} -MD -MF !!Depend -o $@ $<
@${PERL} Build:GCCDepend $@
.cpp.o:
${C++} ${C++FLAGS} -MD -MF !!Depend -o $@ $<
@${PERL} Build:GCCDepend $@
.c++.oz:
${C++} ${C++FLAGS} ${C_MODULE} -MD -MF !!Depend -o $@ $<
@${PERL} Build:GCCDepend $@
.cpp.oz:
${C++} ${C++FLAGS} ${C_MODULE} -MD -MF !!Depend -o $@ $<
@${PERL} Build:GCCDepend $@
# Assembler source files -> object files
.s.o:
${AS} ${ASFLAGS} -o $@ $<
.s.oz:
${AS} ${ASFLAGS} -pd "zM SETL {TRUE}" -o $@ $<
# EOF
Makefiles/ModuleLibs
View file @ 6de1e14c
...@@ -64,6 +64,7 @@ MODMALLOCLIB = C:ModMalloc.o.Lib_M ...@@ -64,6 +64,7 @@ MODMALLOCLIB = C:ModMalloc.o.Lib_M
NCMALIB = C:NCMALib.o.NCMALibZM NCMALIB = C:NCMALib.o.NCMALibZM
NSPRLIB = C:NSPRLib.o.NSPRLibzm NSPRLIB = C:NSPRLib.o.NSPRLibzm
OSLIB = C:OSLib.o.OSLib OSLIB = C:OSLib.o.OSLib
RMVSN = C:RMVersion.o.RMVersionZ
SYNCLIB = C:SyncLib.o.SyncLibzm SYNCLIB = C:SyncLib.o.SyncLibzm
TGRLIB = C:TGRLib.o.tgrlib TGRLIB = C:TGRLib.o.tgrlib
WILDLIB = C:Wild.o.Wild_M WILDLIB = C:Wild.o.Wild_M
......
Makefiles/StdTools
View file @ 6de1e14c
...@@ -47,6 +47,7 @@ FILTERCOMP2 = ${PERL} Build:FilterComp2 ...@@ -47,6 +47,7 @@ FILTERCOMP2 = ${PERL} Build:FilterComp2
GETVERSION = ${PERL} Build:GetVersion GETVERSION = ${PERL} Build:GetVersion
HDR2H = ${PERL} Build:Hdr2H HDR2H = ${PERL} Build:Hdr2H
INSTRES = <Perl$Dir>.perl Build:InstRes INSTRES = <Perl$Dir>.perl Build:InstRes
INSERTVERSION = ${AWK} -f Build:AwkVers
ifeq (C++,${LINK_TYPE}) ifeq (C++,${LINK_TYPE})
LD = link -c++ LD = link -c++
else else
...@@ -65,7 +66,6 @@ SQUASH = squash ...@@ -65,7 +66,6 @@ SQUASH = squash
SQUISH = squish SQUISH = squish
SQZ = squeeze SQZ = squeeze
STRIPDEPEND = stripdepnd STRIPDEPEND = stripdepnd
TIDYDESC = ${PERL} Build:TidyDesc
TLINK = tlink TLINK = tlink
TOGPA = ToGPA TOGPA = ToGPA
TOKENCHECK = tokencheck TOKENCHECK = tokencheck
...@@ -104,6 +104,7 @@ UNZIP = unzip ...@@ -104,6 +104,7 @@ UNZIP = unzip
STDTOOLOPTIONS = -depend !Depend ${THROWBACK} STDTOOLOPTIONS = -depend !Depend ${THROWBACK}
AASMFLAGS += -Stamp -quit ${STDTOOLOPTIONS} ${AASMDEFINES} ${AASMINCLUDES} AASMFLAGS += -Stamp -quit ${STDTOOLOPTIONS} ${AASMDEFINES} ${AASMINCLUDES}
ARFLAGS += -c -o
ASFLAGS += -Stamp -quit ${STDTOOLOPTIONS} ${ASMDEFINES} ${ASMINCLUDES} ASFLAGS += -Stamp -quit ${STDTOOLOPTIONS} ${ASMDEFINES} ${ASMINCLUDES}
ASFLAGS += -ihdr -i<Hdr$Dir>.Global -i<Hdr$Dir>.Interface -i<Hdr$Dir>.Interface2 ASFLAGS += -ihdr -i<Hdr$Dir>.Global -i<Hdr$Dir>.Interface -i<Hdr$Dir>.Interface2
ASFLAGS += -pd "APCS SETS \"${APCS}\"" -pd "Machine SETS \"${MACHINE}\"" -pd "UserIF SETS \"${USERIF}\"" ASFLAGS += -pd "APCS SETS \"${APCS}\"" -pd "Machine SETS \"${MACHINE}\"" -pd "UserIF SETS \"${USERIF}\""
...@@ -111,7 +112,7 @@ CFLAGS += -c ${STDTOOLOPTIONS} ${CDEFINES} ${CINCLUDES} ${C_NO_FNAMES} ${C_WARN ...@@ -111,7 +112,7 @@ CFLAGS += -c ${STDTOOLOPTIONS} ${CDEFINES} ${CINCLUDES} ${C_NO_FNAMES} ${C_WARN
C++INCLUDES += -ICPP: C++INCLUDES += -ICPP:
C++FLAGS += -c ${STDTOOLOPTIONS} ${C++DEFINES} ${C++INCLUDES} C++FLAGS += -c ${STDTOOLOPTIONS} ${C++DEFINES} ${C++INCLUDES}
CMHGFLAGS += -p ${STDTOOLOPTIONS} ${CMHGDEFINES} ${CMHGINCLUDES} CMHGFLAGS += -p ${STDTOOLOPTIONS} ${CMHGDEFINES} ${CMHGINCLUDES}
ARFLAGS += -c -o SQUISHFLAGS += -nolist
C_WARNINGS := -fah C_WARNINGS := -fah
C_OPTSIZE := -Ospace C_OPTSIZE := -Ospace
......
ModuleDB
View file @ 6de1e14c
...@@ -166,6 +166,7 @@ BBCEconet ASM Sources.Networking.BBCEconet ...@@ -166,6 +166,7 @@ BBCEconet ASM Sources.Networking.BBCEconet
BCMSound ASM Sources.HWSupport.Sound.BCMSound HWSupport BCMSound BCMSound ASM Sources.HWSupport.Sound.BCMSound HWSupport BCMSound
BCMSupport C Sources.HWSupport.BCMSupport HWSupport BCMSupport BCMSupport C Sources.HWSupport.BCMSupport HWSupport BCMSupport
BCMVideo C Sources.Video.HWSupport.BCMVideo Video BCMVideo BCMVideo C Sources.Video.HWSupport.BCMVideo Video BCMVideo
BlendTable ASM Sources.Video.Render.BlendTable Video BlendTable
BootCommands C Sources.Programmer.BootCmds Programmer BootCmds BootCommands C Sources.Programmer.BootCmds Programmer BootCmds
BootFX C Sources.Video.UserI.BootFX Video BootFX BootFX C Sources.Video.UserI.BootFX Video BootFX
BootNet ASM Sources.Networking.AUN.BootNet Networking BootNet BootNet ASM Sources.Networking.AUN.BootNet Networking BootNet
...@@ -212,7 +213,7 @@ DADebug ASM Sources.Programmer.DADebug ...@@ -212,7 +213,7 @@ DADebug ASM Sources.Programmer.DADebug
DCS_Quit C Sources.Toolbox.DCS Toolbox DCS DCS_Quit C Sources.Toolbox.DCS Toolbox DCS
DDEUtils ASM Sources.Programmer.DDEUtils Programmer DDEUtils DDEUtils ASM Sources.Programmer.DDEUtils Programmer DDEUtils
DebugButtn ASM Sources.Programmer.DebugButtn Programmer DebugButtn DebugButtn ASM Sources.Programmer.DebugButtn Programmer DebugButtn
Debugger ASM Sources.Programmer.Debugger Programmer Debugger Debugger C Sources.Programmer.Debugger Programmer Debugger
DebugTools ASM Sources.Programmer.DebugTools Programmer DebugTools DebugTools ASM Sources.Programmer.DebugTools Programmer DebugTools
DENCDriver C closed.RiscOS.Sources.Video.HWSupport.DENCDriver Video DENCDriver DENCDriver C closed.RiscOS.Sources.Video.HWSupport.DENCDriver Video DENCDriver
Denmark ASM Sources.Internat.Territory.TerritoryModule Internat Denmark Denmark ASM Sources.Internat.Territory.TerritoryModule Internat Denmark
...@@ -238,12 +239,14 @@ Edit C Sources.Apps.EditApp ...@@ -238,12 +239,14 @@ Edit C Sources.Apps.EditApp
EHCIDriver C Sources.HWSupport.USB.USBDriver.build USB EHCIDriver EHCIDriver C Sources.HWSupport.USB.USBDriver.build USB EHCIDriver
ELFLoader C closed.RiscOS.Sources.Programmer.ELFLoader Programmer ELFLoader ELFLoader C closed.RiscOS.Sources.Programmer.ELFLoader Programmer ELFLoader
EnsureLine C closed.RiscOS.Sources.Networking.Modem.EnsureLine Networking EnsureLine EnsureLine C closed.RiscOS.Sources.Networking.Modem.EnsureLine Networking EnsureLine
EtherB C Sources.Networking.Ethernet.EtherB Networking EtherB
EtherI C closed.RiscOS.Sources.Networking.Ethernet.EtherI Networking EtherI EtherI C closed.RiscOS.Sources.Networking.Ethernet.EtherI Networking EtherI
EtherUSB C Sources.Networking.Ethernet.EtherUSB Networking EtherUSB EtherUSB C Sources.Networking.Ethernet.EtherUSB Networking EtherUSB
EtherK C Sources.Networking.Ethernet.EtherK Networking EtherK EtherK C Sources.Networking.Ethernet.EtherK Networking EtherK
EtherN C closed.RiscOS.Sources.Networking.Ethernet.EtherN Networking EtherN EtherN C closed.RiscOS.Sources.Networking.Ethernet.EtherN Networking EtherN
EtherS C closed.RiscOS.Sources.Networking.Ethernet.EtherS Networking EtherS EtherS C closed.RiscOS.Sources.Networking.Ethernet.EtherS Networking EtherS
EtherT C closed.RiscOS.Sources.Networking.Ethernet.EtherT Networking EtherT EtherT C closed.RiscOS.Sources.Networking.Ethernet.EtherT Networking EtherT
EtherY C Sources.Networking.Ethernet.EtherY Networking EtherY
ExtraResources ASM closed.RiscOS.Sources.Internat.ExtraRes Internat ExtraRes ExtraResources ASM closed.RiscOS.Sources.Internat.ExtraRes Internat ExtraRes
Fetchers C Sources.Networking.Fetchers.Fetchers Networking Fetchers C Sources.Networking.Fetchers.Fetchers Networking
FileCore ASM Sources.FileSys.FileCore FileSys FileCore FileCore ASM Sources.FileSys.FileCore FileSys FileCore
...@@ -457,6 +460,7 @@ RMRun2 ASM closed.RiscOS.Sources.SystemRes.STB.Utilities. ...@@ -457,6 +460,7 @@ RMRun2 ASM closed.RiscOS.Sources.SystemRes.STB.Utilities.
ROMFonts ASM Sources.Video.Render.Fonts.ROMFonts Video ROMFonts ROMFonts ASM Sources.Video.Render.Fonts.ROMFonts Video ROMFonts
ROMpatchU C closed.RiscOS.Sources.SystemRes.Patch2 SystemRes ROMpatchU ROMpatchU C closed.RiscOS.Sources.SystemRes.Patch2 SystemRes ROMpatchU
RPiFiles RES Sources.SystemRes.RPiFiles FileSys RPiFiles RPiFiles RES Sources.SystemRes.RPiFiles FileSys RPiFiles
RTC C Sources.HWSupport.RTC HWSupport RTC
RTCAdjust ASM Sources.HWSupport.RTCAdjust HWSupport RTCAdjust RTCAdjust ASM Sources.HWSupport.RTCAdjust HWSupport RTCAdjust
RTSupport C Sources.Programmer.RTSupport Programmer RTSupport RTSupport C Sources.Programmer.RTSupport Programmer RTSupport
SAfrica ASM Sources.Internat.Territory.TerritoryModule Internat SAfrica SAfrica ASM Sources.Internat.Territory.TerritoryModule Internat SAfrica
...@@ -519,8 +523,7 @@ Spain ASM Sources.Internat.Territory.TerritoryModule ...@@ -519,8 +523,7 @@ Spain ASM Sources.Internat.Territory.TerritoryModule
SprBounce RES Sources.Video.UserI.ScrSavers.SprBounce ThirdParty !SprBounce SprBounce RES Sources.Video.UserI.ScrSavers.SprBounce ThirdParty !SprBounce
SpriteExtend ASM Sources.Video.Render.SprExtend Video SprExtend SpriteExtend ASM Sources.Video.Render.SprExtend Video SprExtend
SpriteUtils ASM Sources.Video.Render.SpriteUtil Video SpriteUtil SpriteUtils ASM Sources.Video.Render.SpriteUtil Video SpriteUtil
Squash ASM Sources.Programmer.SquashBlob Programmer Squash Squash ASM Sources.Programmer.Squash Programmer Squash
SquashClosed ASM Sources.Programmer.Squash Programmer Squash
SrcEdit C Sources.Apps.SrcEdit Apps SrcEdit SrcEdit C Sources.Apps.SrcEdit Apps SrcEdit
Standby C closed.RiscOS.Sources.HWSupport.Standby HWSupport Standby Standby C closed.RiscOS.Sources.HWSupport.Standby HWSupport Standby
StaticIP C closed.RiscOS.Sources.Networking.StaticIP Networking StaticIP StaticIP C closed.RiscOS.Sources.Networking.StaticIP Networking StaticIP
...@@ -626,6 +629,7 @@ ISOForm C closed.RiscOS.Tools.Sources.ISOForm ...@@ -626,6 +629,7 @@ ISOForm C closed.RiscOS.Tools.Sources.ISOForm
LibUtils ASM Tools.Sources.LibUtils Tools LibUtils LibUtils ASM Tools.Sources.LibUtils Tools LibUtils
libfile C Tools.Sources.libfile Tools libfile libfile C Tools.Sources.libfile Tools libfile
libgnu C Tools.Sources.GNU.libgnu Tools libgnu libgnu C Tools.Sources.GNU.libgnu Tools libgnu
libgnu4 C Tools.Sources.GNU.libgnu4 Tools libgnu4
link C Tools.Sources.link Tools link link C Tools.Sources.link Tools link
make C Tools.Sources.make Tools make make C Tools.Sources.make Tools make
mkdir C Tools.Sources.UNIX.mkdir Tools mkdir mkdir C Tools.Sources.UNIX.mkdir Tools mkdir
...@@ -708,6 +712,7 @@ Config2PluginPinSetup C Sources.SystemRes.Configure2.PlugIns.PinSetup ...@@ -708,6 +712,7 @@ Config2PluginPinSetup C Sources.SystemRes.Configure2.PlugIns.PinSetup
Config2PluginScrnSetup C Sources.SystemRes.Configure2.PlugIns.ScrnSetup SystemRes ScrnSetup Config2PluginScrnSetup C Sources.SystemRes.Configure2.PlugIns.ScrnSetup SystemRes ScrnSetup
Config2PluginSndSetup C Sources.SystemRes.Configure2.PlugIns.SndSetup SystemRes SndSetup Config2PluginSndSetup C Sources.SystemRes.Configure2.PlugIns.SndSetup SystemRes SndSetup
Config2PluginSndSetupVIDC C Sources.SystemRes.Configure2.PlugIns.SndSetupVIDC SystemRes SndSetup Config2PluginSndSetupVIDC C Sources.SystemRes.Configure2.PlugIns.SndSetupVIDC SystemRes SndSetup
Config2PluginThemeSetup C Sources.SystemRes.Configure2.PlugIns.ThemeSetup SystemRes ThemeSetup
Config2PluginTimeSetup C Sources.SystemRes.Configure2.PlugIns.TimeSetup SystemRes TimeSetup Config2PluginTimeSetup C Sources.SystemRes.Configure2.PlugIns.TimeSetup SystemRes TimeSetup
Config2PluginWindSetup C Sources.SystemRes.Configure2.PlugIns.WindSetup SystemRes WindSetup Config2PluginWindSetup C Sources.SystemRes.Configure2.PlugIns.WindSetup SystemRes WindSetup
Config2PluginxxxxMerge C Sources.SystemRes.Configure2.PlugIns.Config2PluginxxxxMerge SystemRes xxxxMerge Config2PluginxxxxMerge C Sources.SystemRes.Configure2.PlugIns.Config2PluginxxxxMerge SystemRes xxxxMerge
......
VersionNum
View file @ 6de1e14c
...@@ -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.3 #define Module_MinorVersion_CMHG 1.142.2.4
#define Module_Date_CMHG 08 Jul 2013 #define Module_Date_CMHG 20 Feb 2014
#define Module_MajorVersion "6.00" #define Module_MajorVersion "6.00"
#define Module_Version 600 #define Module_Version 600
#define Module_MinorVersion "1.142.2.3" #define Module_MinorVersion "1.142.2.4"
#define Module_Date "08 Jul 2013" #define Module_Date "20 Feb 2014"
#define Module_ApplicationDate "08-Jul-13" #define Module_ApplicationDate "20-Feb-14"
#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.3)" #define Module_FullVersion "6.00 (1.142.2.4)"
#define Module_HelpVersion "6.00 (08 Jul 2013) 1.142.2.3" #define Module_HelpVersion "6.00 (20 Feb 2014) 1.142.2.4"
#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