Fix up build environment

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

View File

@@ -197,12 +197,13 @@ Set AvailableFeatures "hasROMGibbly
useROMFonts "
If "` ParseFeatures -a "{AvailableFeatures}" -f ": ROM {1}" `" =~ /': ROM '(<28>)<29>1/
Set Defines "{<EFBFBD>1}"
Else
Exit 1
For Feature in {AvailableFeatures}
Set Defines "{Defines} -d {Feature}=`Evaluate " {1} " =~ /<2F> {Feature} <20>/`"
End
# Ugh!
Set Defines "`Echo {Defines} | StreamEdit -e '<27>,<2C> Replace /=1/ "=TRUE" -c <20>' -e '<27>,<2C> Replace /=0/ "=FALSE" -c <20>'`"
For Override in {2}
If "{Override}" =~ /(<28>)<29>1=(<28>)<29>2/

View File

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

View File

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

View File

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

View File

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

View File

@@ -49,7 +49,7 @@ Boot3Objects = "{ObjDir}Boot3.a.o"
Rez {StdROpts} -a -o "{targ}" -d ROMBuildTime="{ROMBuildTime}" "{StartDir}Gibbly.r" || Exit 1
"{RsrcDir}Gibbly.rsrc" <09><> {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" <09> {StartMgrObjs}
Lib {StdLibOpts} {StartMgrObjs} -o "{Targ}"