Macintosh-SW/boot3
1
0
Fork 0
mirror of https://github.com/elliotnunn/boot3.git synced 2024-12-26 07:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix up build environment

Browse Source
This commit is contained in:
Elliot Nunn 2018-01-02 16:23:12 +08:00
parent 28cdb676e0
commit 0217003077
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Make/FeatureList
View File

@ -197,12 +197,13 @@ Set AvailableFeatures "hasROMGibbly
useROMFonts " useROMFonts "
If "` ParseFeatures -a "{AvailableFeatures}" -f ": ROM {1}" `" =~ /': ROM '(Å)¨1/ For Feature in {AvailableFeatures}
Set Defines "{¨1}" Set Defines "{Defines} -d {Feature}=`Evaluate " {1} " =~ /Å {Feature} Å/`"
Else
Exit 1
End End
# Ugh!
Set Defines "`Echo {Defines} | StreamEdit -e '¥,° Replace /=1/ "=TRUE" -c °' -e '¥,° Replace /=0/ "=FALSE" -c °'`"
For Override in {2} For Override in {2}
If "{Override}" =~ /(Å)¨1=(Å)¨2/ If "{Override}" =~ /(Å)¨1=(Å)¨2/

2
Make/MainCode.Make
View File

@ -40,7 +40,7 @@ IfSrcDir = {Sources}Libs:InterfaceSrcs:
LibraryDir = {Sources}Libs:Libraries: LibraryDir = {Sources}Libs:Libraries:
#include {OSDir}OS.make #include {OSDir}OS.make
#include {ToolBoxDir}Toolbox.make ##include {ToolBoxDir}Toolbox.make
#include {ColorQDDir}ColorQD.make #include {ColorQDDir}ColorQD.make
#include {IfSrcDir}Interface.make #include {IfSrcDir}Interface.make

6
Make/RISC.make
View File

@ -379,12 +379,12 @@ Clean
.cp.o Ä .c .cp.o Ä .c
{CPlus} {StdCPOpts} -o {Targ} {DepDir}{Default}.cp {CPlus} {StdCPOpts} -o {Targ} {DepDir}{Default}.cp
#include {ToolSrcDir}Tools.make ##include {ToolSrcDir}Tools.make
#include {DriverDir}Drivers.make
#include {MakeDir}MainCode.make #include {MakeDir}MainCode.make
#include {DeclDir}DeclData.make #include {DeclDir}DeclData.make
#include {DriverDir}Drivers.make
#include {ResourceDir}Resources.make #include {ResourceDir}Resources.make

4
OS/MemoryMgr/MemoryMgr.make
View File

@ -17,9 +17,6 @@
FigmentDir = {MemoryMgrDir}FigmentSources: FigmentDir = {MemoryMgrDir}FigmentSources:
#include {FigmentDir}Figment.Make
MemoryMgrObjs = "{ObjDir}MemoryMgr.a.o" ¶ MemoryMgrObjs = "{ObjDir}MemoryMgr.a.o" ¶
"{ObjDir}MemoryMgrExtensions.a.o" ¶ "{ObjDir}MemoryMgrExtensions.a.o" ¶
"{ObjDir}MemoryMgrInternal.a.o" ¶ "{ObjDir}MemoryMgrInternal.a.o" ¶
@ -66,3 +63,4 @@ MemoryMgrObjs = "{ObjDir}MemoryMgr.a.o"
Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}MemoryMgrInternal.a" Asm {StdAOpts} -o "{Targ}" "{MemoryMgrDir}MemoryMgrInternal.a"
#include {FigmentDir}Figment.Make

4
OS/OS.make
View File

@ -67,14 +67,14 @@ RealTimeDir = {OSDir}RealTime:
#include {ADBDir}ADBMgr.make #include {ADBDir}ADBMgr.make
#include {TimeMgrDir}TimeMgr.make #include {TimeMgrDir}TimeMgr.make
#include {MemoryMgrDir}MemoryMgr.make #include {MemoryMgrDir}MemoryMgr.make
#include {BeepDir}Beep.make ##include {BeepDir}Beep.make
#include {FPEmulationDir}FPEmulation.make #include {FPEmulationDir}FPEmulation.make
#include {GestaltDir}Gestalt.make #include {GestaltDir}Gestalt.make
#include {KeyboardDir}Keyboard.make #include {KeyboardDir}Keyboard.make
#include {NetBootDir}NetBoot.make #include {NetBootDir}NetBoot.make
#include {VDigDir}VDig.make #include {VDigDir}VDig.make
#include {I2CDir}I2C.make #include {I2CDir}I2C.make
#include {RealTimeDir}RealTime.make ##include {RealTimeDir}RealTime.make
OSObjs = "{ObjDir}clock.a.o" ¶ OSObjs = "{ObjDir}clock.a.o" ¶

2
OS/StartMgr/StartMgr.make
View File

@ -49,7 +49,7 @@ Boot3Objects = "{ObjDir}Boot3.a.o"
Rez {StdROpts} -a -o "{targ}" -d ROMBuildTime="{ROMBuildTime}" "{StartDir}Gibbly.r" || Exit 1 Rez {StdROpts} -a -o "{targ}" -d ROMBuildTime="{ROMBuildTime}" "{StartDir}Gibbly.r" || Exit 1
"{RsrcDir}Gibbly.rsrc" ÄÄ {Boot3Objects} "{RsrcDir}Gibbly.rsrc" ÄÄ {Boot3Objects}
Link {StdLOpts} {StdAlign} -o "{Targ}" {Boot3Objects} -rt 'boot=3' -ra =resSysHeap,resLocked || Exit 1 Link {StdLOpts} -o "{Targ}" {Boot3Objects} -rt 'boot=3' -ra =resSysHeap,resLocked || Exit 1
"{LibDir}StartMgr.lib" Ä {StartMgrObjs} "{LibDir}StartMgr.lib" Ä {StartMgrObjs}
Lib {StdLibOpts} {StartMgrObjs} -o "{Targ}" Lib {StdLibOpts} {StartMgrObjs} -o "{Targ}"