Macintosh-SW/supermario
1
0
Fork 0
mirror of https://github.com/elliotnunn/supermario.git synced 2024-11-26 01:49:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix minor mistake in a previous commit

Browse Source 
The commit "Cube-E: fix especially the Comm Toolbox" placed some changes
to System.make in source.patch. Changes to makefiles should go in
build-system.patch. Never mind that System.make is created from whole
cloth and cannot have meaningful changes anyway.
This commit is contained in:
Elliot Nunn 2019-04-14 23:01:59 +08:00
parent 5c122668c3
commit 0f2d4c304d
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patchset/Cube-E/2-build-system.patch
View File

@ -228,7 +228,7 @@ new file mode 100644
+ "{RsrcDir}SoundPFDProc.rsrc" ∂ + "{RsrcDir}SoundPFDProc.rsrc" ∂
+ "{RsrcDir}SoundInputProc.rsrc" ∂ + "{RsrcDir}SoundInputProc.rsrc" ∂
+ "{RsrcDir}SnthLoading.rsrc" ∂ + "{RsrcDir}SnthLoading.rsrc" ∂
+# "{RsrcDir}StandardNBP.p.rsrc" ∂ + "{RsrcDir}StandardNBP.p.rsrc" ∂
+ "{RsrcDir}StandardWDEF.a.rsrc" ∂ + "{RsrcDir}StandardWDEF.a.rsrc" ∂
+ "{RsrcDir}StandardFile.rsrc" ∂ + "{RsrcDir}StandardFile.rsrc" ∂
+ "{RsrcDir}TFBDriver.a.rsrc" ∂ + "{RsrcDir}TFBDriver.a.rsrc" ∂
@ -763,7 +763,7 @@ new file mode 100644
+ "{IntRIncludes}CommToolboxPriv.r" + "{IntRIncludes}CommToolboxPriv.r"
+ Rez {StdROpts} -o {Targ} "{CommChooseDir}Choose.r" + Rez {StdROpts} -o {Targ} "{CommChooseDir}Choose.r"
+"{RsrcDir}StandardNBP.p.rsrc" ƒ {StandardNBPObjs} +"{RsrcDir}StandardNBP.p.rsrc" ƒ {StandardNBPObjs}
+ Link {StdLOpts} {StdAlign} -rt RSRC=0 -o {Targ} {StandardNBPObjs} + Link {StdLOpts} {StdAlign} -rt RSRC=0 -m MAIN -o {Targ} {StandardNBPObjs}
+"{RsrcDir}StandardNBPHelp.r.rsrc" ƒ "{CommNBPDir}StandardNBPHelp.r" ∂ +"{RsrcDir}StandardNBPHelp.r.rsrc" ƒ "{CommNBPDir}StandardNBPHelp.r" ∂
+ "{RIncludes}BalloonTypes.r" ∂ + "{RIncludes}BalloonTypes.r" ∂
+ "{IntRIncludes}CommToolboxPriv.r" + "{IntRIncludes}CommToolboxPriv.r"

21
patchset/Cube-E/6-source.patch
View File

@ -6965,27 +6965,6 @@ diff --git a/LinkedPatches/LinkedPatchLoader.a b/LinkedPatches/LinkedPatchLoader
dsLinkedPatchReferenceTooFar equ 97 ; *** move into SysErr.a dsLinkedPatchReferenceTooFar equ 97 ; *** move into SysErr.a
k32BitCQDTrap equ $AB03 ; trap number for 32-bit QuickDraw k32BitCQDTrap equ $AB03 ; trap number for 32-bit QuickDraw
diff --git a/Make/System.make b/Make/System.make
--- a/Make/System.make
+++ b/Make/System.make
@@ -152,7 +152,7 @@ ResourceFiles = ∂
"{RsrcDir}SoundPFDProc.rsrc" ∂
"{RsrcDir}SoundInputProc.rsrc" ∂
"{RsrcDir}SnthLoading.rsrc" ∂
-# "{RsrcDir}StandardNBP.p.rsrc" ∂
+ "{RsrcDir}StandardNBP.p.rsrc" ∂
"{RsrcDir}StandardWDEF.a.rsrc" ∂
"{RsrcDir}StandardFile.rsrc" ∂
"{RsrcDir}TFBDriver.a.rsrc" ∂
@@ -687,7 +687,7 @@ LinkPatchToolObjs = "{Sources}LinkedPatches:LinkPatchLib.o" "{ObjDir}LinkPatch.a
"{IntRIncludes}CommToolboxPriv.r"
Rez {StdROpts} -o {Targ} "{CommChooseDir}Choose.r"
"{RsrcDir}StandardNBP.p.rsrc" ƒ {StandardNBPObjs}
- Link {StdLOpts} {StdAlign} -rt RSRC=0 -o {Targ} {StandardNBPObjs}
+ Link {StdLOpts} {StdAlign} -rt RSRC=0 -m MAIN -o {Targ} {StandardNBPObjs}
"{RsrcDir}StandardNBPHelp.r.rsrc" ƒ "{CommNBPDir}StandardNBPHelp.r" ∂
"{RIncludes}BalloonTypes.r" ∂
"{IntRIncludes}CommToolboxPriv.r"
diff --git a/OS/ADBMgr/ADBMgrPatch.a b/OS/ADBMgr/ADBMgrPatch.a diff --git a/OS/ADBMgr/ADBMgrPatch.a b/OS/ADBMgr/ADBMgrPatch.a
--- a/OS/ADBMgr/ADBMgrPatch.a --- a/OS/ADBMgr/ADBMgrPatch.a
+++ b/OS/ADBMgr/ADBMgrPatch.a +++ b/OS/ADBMgr/ADBMgrPatch.a