Fill gaps in Cube-E build
After working incrementally towards a perfect Cube-E build, returns are diminishing. This Amphibian DNA approach allows the production of bootable builds!
This commit is contained in:
Elliot Nunn
parent
d217803599
commit
90b77d716d
|
|
@ -194,8 +194,8 @@ new file mode 100644
|
|||
+ "{RsrcDir}ColorPicker.p.rsrc" ∂
|
||||
+ "{RsrcDir}DeCompressDefProc.a.rsrc" ∂
|
||||
+ "{RsrcDir}DeCompressDefProc1.a.rsrc" ∂
|
||||
+# "{RsrcDir}EDiskShutdownPtch.a.rsrc" ∂
|
||||
+# "{RsrcDir}Gestalt.rsrc" ∂
|
||||
+ "{RsrcDir}EDiskShutdownPtch.a.rsrc" ∂
|
||||
+ "{RsrcDir}Gestalt.rsrc" ∂
|
||||
+ "{RsrcDir}GreggyBitsDefProc.a.rsrc" ∂
|
||||
+ "{RsrcDir}LayerWDEF.c.rsrc" ∂
|
||||
+ "{RsrcDir}MACE3.c.rsrc" ∂
|
||||
|
|
@ -1590,7 +1590,7 @@ new file mode 100644
|
|||
+ Set DataAccessMgr "{DataAccessDir}"; Export DataAccessMgr
|
||||
+ Set Keyboard "{OSDir}Keyboard:"; Export Keyboard
|
||||
+ Set RealObjDir "{ObjDir}"; Set ObjDir "{RsrcDir}"
|
||||
+ Rez {StdROpts} -d VidExtVers=∂"ello∂" -d LIntVers=0x07,0x10,final,0 -d LangInt=verUS "{ResourceDir}Sys.r" -o {Targ}
|
||||
+ Rez {StdROpts} -d VidExtVers=∂"1.0.1∂" -d LIntVers=0x07,0x10,final,0 -d LangInt=verUS "{ResourceDir}Sys.r" -o {Targ}
|
||||
+ Set ObjDir "{RealObjDir}"
|
||||
diff --git a/Make/System.make.idump b/Make/System.make.idump
|
||||
new file mode 100644
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -11071,7 +11071,7 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump
|
|||
$"4A00 584F 6606 303C EA84 601A 558F 2F3C" /* J.XOf.0<..`.U./< */
|
||||
$"666C 6167 487A FFA0 4EBA 0604 3E1F 6704" /* flagHz..N...>.g. */
|
||||
$"3007 6002 7000 2E2E FFFC 4E5E 4E75 4E56" /* 0.`.p.....N^NuNV */
|
||||
@@ -5831,283 +7105,288 @@ data 'AINI' (30000, sysheap, locked) {
|
||||
@@ -5831,283 +7105,300 @@ data 'AINI' (30000, sysheap, locked) {
|
||||
};
|
||||
|
||||
data 'AINI' (30, sysheap, locked) {
|
||||
|
|
@ -11108,12 +11108,6 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump
|
|||
- $"0202 4E75 6100 FFCC 6720 A128 4A78 0220" /* ..Nua...g .(Jx. */
|
||||
- $"6618 2F08 2F08 A992 225F 4A78 0A60 660A" /* f././..."_Jx.`f. */
|
||||
- $"303C A023 A146 C149 4ED1 4E75" /* 0<.#.F.IN.Nu */
|
||||
-};
|
||||
-
|
||||
-data 'AINI' (10, sysheap, purgeable, locked) {
|
||||
- $"598F 203C 5349 4E49 2F00 4240 2478 02AE" /* Y. <SINI/.B@$x.. */
|
||||
- $"102A 0009 3F00 A9A0 201F 6602 4E75 2440" /* .*..?... .f.Nu$@ */
|
||||
- $"2452 4E92 4E75" /* $RN.Nu */
|
||||
+ $"0038 6026 303C 0018 4267 51C8 FFFC 1F68" /* .8`&0<..BgQ....h */
|
||||
+ $"0031 0022 1F68 0032 0023 487A 0016 2F5F" /* .1.".h.2.#Hz../_ */
|
||||
+ $"0012 204F A200 4FEF 006A 41FA FF44 4EFA" /* .. O..O..jA..DN. */
|
||||
|
|
@ -11126,6 +11120,22 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump
|
|||
+ $"4E75" /* Nu */
|
||||
};
|
||||
|
||||
-data 'AINI' (10, sysheap, purgeable, locked) {
|
||||
- $"598F 203C 5349 4E49 2F00 4240 2478 02AE" /* Y. <SINI/.B@$x.. */
|
||||
- $"102A 0009 3F00 A9A0 201F 6602 4E75 2440" /* .*..?... .f.Nu$@ */
|
||||
- $"2452 4E92 4E75" /* $RN.Nu */
|
||||
+data 'ecfg' (19) {
|
||||
+ $"00E0 0000 FE00 0000 FE40 0000 0000 0003" /* .........@...... */
|
||||
+ $"0000 0009 0000 0000 0E00 0000 0000 0000" /* ................ */
|
||||
+ $"0000 0000" /* .... */
|
||||
+};
|
||||
+
|
||||
+data 'ecfg' (37) {
|
||||
+ $"00E0 0000 FE00 0000 FE40 0000 0000 0003" /* .........@...... */
|
||||
+ $"0000 0009 0000 0000 0E00 0000 0000 0000" /* ................ */
|
||||
+ $"0000 0000" /* .... */
|
||||
};
|
||||
|
||||
data 'tokn' (52, ".TOKN for Ringer", sysheap, purgeable, locked) {
|
||||
- $"4400 0000 0000 0000 0070 02CA 0380 02CA" /* D........p...... */
|
||||
- $"07AA 052E 544F 4B4E 0100 8000 0000 0531" /* ....TOKN.......1 */
|
||||
|
|
@ -11631,7 +11641,7 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump
|
|||
$"4E5E 4E75 3D00 544F 4B4E 0000 4E56 FFB6" /* N^Nu=.TOKN..NV.. */
|
||||
$"41EE FFBC 303C 0001 A090 322E FFC0 0C41" /* A...0<....2....A */
|
||||
$"0700 654E 554F 3F3C 8000 2F2E 0008 3F3C" /* ..eNUO?<../...?< */
|
||||
@@ -6123,323 +7402,345 @@ data 'tokn' (52, ".TOKN for Ringer", sysheap, purgeable, locked) {
|
||||
@@ -6123,323 +7414,345 @@ data 'tokn' (52, ".TOKN for Ringer", sysheap, purgeable, locked) {
|
||||
$"303C 0800 C047 6704 7001 6002 7000 1C00" /* 0<...Gg.p.`.p... */
|
||||
$"7000 1006 0C40 0001 6646 303C 07FF C047" /* p....@..fF0<...G */
|
||||
$"3E00 48C7 598F 3F3C A86E 7001 1F00 4EBA" /* >.H.Y.?<.np...N. */
|
||||
|
|
@ -12287,7 +12297,7 @@ diff --git a/Misc/APTK57.rsrc.rdump b/Misc/APTK57.rsrc.rdump
|
|||
$"4E5E 4E75 3D00 544F 4B4E 0000 4E56 FFB6" /* N^Nu=.TOKN..NV.. */
|
||||
$"41EE FFBC 303C 0001 A090 322E FFC0 0C41" /* A...0<....2....A */
|
||||
$"0700 654E 554F 3F3C 8000 2F2E 0008 3F3C" /* ..eNUO?<../...?< */
|
||||
@@ -6455,78 +7756,82 @@ data 'tokn' (11, ".TOKN for Medusa", sysheap, purgeable, locked) {
|
||||
@@ -6455,78 +7768,82 @@ data 'tokn' (11, ".TOKN for Medusa", sysheap, purgeable, locked) {
|
||||
$"303C 0800 C047 6704 7001 6002 7000 1C00" /* 0<...Gg.p.`.p... */
|
||||
$"7000 1006 0C40 0001 6646 303C 07FF C047" /* p....@..fF0<...G */
|
||||
$"3E00 48C7 598F 3F3C A86E 7001 1F00 4EBA" /* >.H.Y.?<.np...N. */
|
||||
|
|
|
|||
|
|
@ -14670,7 +14670,57 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
<290> 1/23/92 hsK Deleted 'dtab' resource which is no more used by the Dictionary
|
||||
manager.
|
||||
<289> 1/18/92 DTY Lock the print driver so that it will get loaded low in the
|
||||
@@ -819,21 +815,20 @@
|
||||
@@ -780,6 +776,49 @@
|
||||
|
||||
*/
|
||||
|
||||
+//__________________________________________________________________________________________________
|
||||
+// Resources that cannot be found in the SuperMario source. Move out of here if possible.
|
||||
+
|
||||
+data 'DITL' (-16601, sysheap) {
|
||||
+ $"0004 0000 0000 0084 004B 0098 0088 0406" /* .........K...... */
|
||||
+ $"4361 6E63 656C 0000 0000 0084 009C 0098" /* Cancel.......... */
|
||||
+ $"00F7 040B 5072 696E 7420 4C61 7465 7200" /* ....Print Later. */
|
||||
+ $"0000 0000 0084 010B 0098 015F 0409 5072" /* ..........._..Pr */
|
||||
+ $"696E 7420 4E6F 7700 0000 0000 000A 0014" /* int Now......... */
|
||||
+ $"002A 0034 A002 0002 0000 0000 0007 004A" /* .*.4...........J */
|
||||
+ $"0077 0163 88BA 596F 7572 2064 6F63 756D" /* .w.c..Your docum */
|
||||
+ $"656E 7420 7769 6C6C 2062 6520 7072 696E" /* ent will be prin */
|
||||
+ $"7465 6420 696E 2074 6865 2062 6163 6B67" /* ted in the backg */
|
||||
+ $"726F 756E 6420 7768 656E 206D 6F72 6520" /* round when more */
|
||||
+ $"6D65 6D6F 7279 2069 7320 6176 6169 6C61" /* memory is availa */
|
||||
+ $"626C 652E 0D0D 596F 7520 6361 6E20 7472" /* ble...You can tr */
|
||||
+ $"7920 7072 696E 7469 6E67 206E 6F77 2069" /* y printing now i */
|
||||
+ $"6E73 7465 6164 2C20 6275 7420 796F 7520" /* nstead, but you */
|
||||
+ $"7769 6C6C 206E 6F74 2062 6520 6162 6C65" /* will not be able */
|
||||
+ $"2074 6F20 636F 6E74 696E 7565 2077 6F72" /* to continue wor */
|
||||
+ $"6B69 6E67 2075 6E74 696C 2070 7269 6E74" /* king until print */
|
||||
+ $"696E 6720 6973 2066 696E 6973 6865 642E" /* ing is finished. */
|
||||
+};
|
||||
+
|
||||
+data 'RECT' (-16601, sysheap) {
|
||||
+ $"002C 001C 00CE 0189" /* .,...... */
|
||||
+};
|
||||
+
|
||||
+data 'STR ' (-16601, sysheap) {
|
||||
+ $"0C50 7269 6E74 4D6F 6E69 746F 72" /* .PrintMonitor */
|
||||
+};
|
||||
+
|
||||
+data 'STR ' (-16392, sysheap, locked) {
|
||||
+ $"6154 6865 7265 2061 7265 206D 6F72 6520" /* aThere are more */
|
||||
+ $"7468 616E 2031 3238 2066 6F6E 7420 6669" /* than 128 font fi */
|
||||
+ $"6C65 7320 696E 2074 6865 2046 6F6E 7473" /* les in the Fonts */
|
||||
+ $"2066 6F6C 6465 722E 2020 536F 6D65 2066" /* folder. Some f */
|
||||
+ $"6F6E 7473 206D 6179 206E 6F74 2062 6520" /* onts may not be */
|
||||
+ $"6176 6169 6C61 626C 6520 666F 7220 7573" /* available for us */
|
||||
+ $"652E" /* e. */
|
||||
+};
|
||||
+
|
||||
+
|
||||
#include "Types.r"
|
||||
#include "SysTypes.r"
|
||||
|
||||
@@ -819,21 +858,20 @@
|
||||
|
||||
//__________________________________________________________________________________________________
|
||||
// version
|
||||
|
|
@ -14695,7 +14745,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
'ICN#', { 3, 3; -16415, -16415; 5, -5696; -16494, -16494; -16509, -16509 };
|
||||
}
|
||||
};
|
||||
@@ -842,6 +837,7 @@
|
||||
@@ -842,6 +880,7 @@
|
||||
resource 'MACS' (0, purgeable) { VersionString };
|
||||
|
||||
resource 'FREF' (6) { 'zsys', -16494, "" }; // System File for 7.0
|
||||
|
|
@ -14703,7 +14753,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
resource 'FREF' (0) { 'ZSYS', 3, "" }; // System File for 6.0.x & other systemish files
|
||||
resource 'FREF' (1) { 'FNDR', 3, "" }; // Finder
|
||||
resource 'FREF' (2) { 'INIT', -16415, "" }; // standard INIT
|
||||
@@ -885,7 +881,34 @@
|
||||
@@ -885,7 +924,34 @@
|
||||
"PowerBook 100", // 24 Asahi
|
||||
"PowerBook 140", // 25 TimLC
|
||||
"Macintosh Quadra 950", // 26 Zydeco <13> Leave 4 trailing spaces for the Installer
|
||||
|
|
@ -14739,7 +14789,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
} };
|
||||
|
||||
type 'dbex' { integer=0; }; // nothing
|
||||
@@ -927,7 +950,7 @@
|
||||
@@ -927,7 +993,7 @@
|
||||
$0006, $0007, $0008, $0009,
|
||||
$000A, $000B, $000C, $000D,
|
||||
$000E, $000F, $0010, $0011,
|
||||
|
|
@ -14748,7 +14798,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
};
|
||||
};
|
||||
|
||||
@@ -953,7 +976,7 @@
|
||||
@@ -953,7 +1019,7 @@
|
||||
// Picasso Macintosh icon (loaded by System Error Handler)
|
||||
|
||||
resource 'cicn' (-16396, purgeable) {
|
||||
|
|
@ -14757,7 +14807,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
// mask
|
||||
$"0007FF80 00080000 00087E20 00080120"
|
||||
$"00080120 04080120 0C080120 08080120"
|
||||
@@ -1078,16 +1101,7 @@
|
||||
@@ -1078,16 +1144,7 @@
|
||||
|
||||
'clut', 127; // 8 standard QuickDraw colors; green is fixed
|
||||
|
||||
|
|
@ -14774,16 +14824,16 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
'INIT', 18; // AppleTalk
|
||||
'lmgr', 0; // AppleTalk
|
||||
|
||||
@@ -1129,7 +1143,7 @@
|
||||
@@ -1129,7 +1186,7 @@
|
||||
|
||||
IncSys "ParityINIT.a.rsrc" codeAs 'INIT' (10, sysHeap, locked);
|
||||
|
||||
- IncSys "EDiskShutdownPtch.a.rsrc" codeAs 'INIT' (12, sysHeap, locked);
|
||||
+// IncSys "EDiskShutdownPtch.a.rsrc" codeAs 'INIT' (12, sysHeap, locked);
|
||||
+ IncSys "EDiskShutdownPtch.a.rsrc"; // UI resources only, INIT in linked patches
|
||||
|
||||
|
||||
resource 'mcky' (0, sysHeap, purgeable) { { 255, 255, 255, 255, 255, 255, 255, 255 } };
|
||||
@@ -1168,8 +1182,8 @@
|
||||
@@ -1168,8 +1225,8 @@
|
||||
//__________________________________________________________________________________________________
|
||||
// AppleTalk
|
||||
|
||||
|
|
@ -14794,7 +14844,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
|
||||
// ^^ incorporates the following:
|
||||
// IncSys "AppleTalk.rsrc" not 'vers';
|
||||
@@ -1180,16 +1194,16 @@
|
||||
@@ -1180,16 +1237,16 @@
|
||||
"Your system has been placed in AppleTalk zone “",
|
||||
|
||||
"”. "
|
||||
|
|
@ -14815,7 +14865,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
"then click the selected AppleTalk connection icon.",
|
||||
} };
|
||||
|
||||
@@ -1241,6 +1255,10 @@
|
||||
@@ -1241,6 +1298,10 @@
|
||||
"The Router could not run. "
|
||||
"The Router file is damaged. "
|
||||
"Please reinstall the Router.",
|
||||
|
|
@ -14826,7 +14876,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
} };
|
||||
|
||||
//__________________________________________________________________________________________________
|
||||
@@ -1908,6 +1926,7 @@ resource 'STR ' (-16391, purgeable) { "Font Cache" };
|
||||
@@ -1908,6 +1969,7 @@ resource 'STR ' (-16391, purgeable) { "Font Cache" };
|
||||
data 'FONT' (384, "Geneva", purgeable) {};
|
||||
IncSys "SystemFonts.rsrc" 'FONT' (393) as 'FONT' (393, purgeable);
|
||||
IncSys "SystemFonts.rsrc" 'FONT' (396) as 'FONT' (396, purgeable);
|
||||
|
|
@ -14834,16 +14884,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
|
||||
resource 'FOND' (4, "Monaco", purgeable) {
|
||||
FakeFONDFlags, 4, FakeFONDFields, 1, { 9, plain, 521; }, FakeFONDTables
|
||||
@@ -1954,7 +1973,7 @@ resource 'STR#' (glyphNameResID, purgeable) { {
|
||||
//__________________________________________________________________________________________________
|
||||
// Gestalt
|
||||
|
||||
- IncSys "Gestalt.rsrc" codeAs 'ptch' (5, sysHeap, locked);
|
||||
+// IncSys "Gestalt.rsrc" codeAs 'ptch' (5, sysHeap, locked);
|
||||
|
||||
//__________________________________________________________________________________________________
|
||||
// pslt • Nubus pseudo-slot mapping definitions
|
||||
@@ -2121,16 +2140,24 @@ resource 'pslt' (gestaltEclipse33, purgeable) {
|
||||
@@ -2121,16 +2183,24 @@ resource 'pslt' (gestaltEclipse33, purgeable) {
|
||||
|
||||
IncSys "International.rsrc" 'kcs#' (0) as 'kcs#' (0, sysHeap, purgeable);
|
||||
IncSys "International.rsrc" 'kcs4' (0) as 'kcs4' (0, sysHeap, purgeable);
|
||||
|
|
@ -14872,7 +14913,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
|
||||
//__________________________________________________________________________________________________
|
||||
// List Mgr
|
||||
@@ -2540,13 +2567,6 @@ resource 'ppci' (-16409)
|
||||
@@ -2540,13 +2610,6 @@ resource 'ppci' (-16409)
|
||||
IncSys "Scheduler.rsrc";
|
||||
IncSys "DAHandler.rsrc";
|
||||
|
||||
|
|
@ -14886,7 +14927,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
//__________________________________________________________________________________________________
|
||||
// QuickDraw
|
||||
|
||||
@@ -3101,16 +3121,6 @@ resource 'ppci' (-16409)
|
||||
@@ -3101,16 +3164,6 @@ resource 'ppci' (-16409)
|
||||
} };
|
||||
|
||||
//__________________________________________________________________________________________________
|
||||
|
|
@ -14903,7 +14944,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
// Virtual Memory
|
||||
|
||||
include $$Shell("Misc")"VM.rsrc" not 'ckid';
|
||||
@@ -3165,7 +3175,7 @@ data 'ppat' (18, sysheap, purgeable) {
|
||||
@@ -3165,7 +3218,7 @@ data 'ppat' (18, sysheap, purgeable) {
|
||||
// color desktop pattern = dithered gray
|
||||
resource 'ppat' (16, sysHeap, purgeable) {
|
||||
$"AA55AA55AA55AA55", // black & white pattern
|
||||
|
|
@ -14912,7 +14953,7 @@ diff --git a/Resources/Sys.r b/Resources/Sys.r
|
|||
// 4-bit color image
|
||||
$"10101010"
|
||||
$"01010101"
|
||||
@@ -3540,78 +3550,4 @@ data 'ppat' (18, sysheap, purgeable) {
|
||||
@@ -3540,78 +3593,4 @@ data 'ppat' (18, sysheap, purgeable) {
|
||||
|
||||
#if hasAppleEventMgr
|
||||
IncSys "AppleEventMgr.rsrc";
|
||||
|
|
|
|||
Loading…
Reference in New Issue