From 4204a9c355001aa61404ec2ab497d83131edf332 Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Wed, 15 Nov 2017 15:38:41 +0800 Subject: [PATCH] Build MMU.lib from sources The sources needed no changes (how embarrassing), except to remove an unnecessary dependence on a nonexistent SoundPrivate.a. Lastly.lib had an incorrect position for SIDESOUNDBUFFER, which has been fixed. --- BuildResults/RISC/Lib/Lastly.lib | Bin 1336 -> 1022 bytes BuildResults/RISC/Lib/MMU.lib | Bin 3498 -> 0 bytes OS/MMU/MMU.a | 2 +- OS/MMU/MMU.make | 5 ++--- 4 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 BuildResults/RISC/Lib/MMU.lib diff --git a/BuildResults/RISC/Lib/Lastly.lib b/BuildResults/RISC/Lib/Lastly.lib index 65c25c88109dbba098ea2a7a99b62cc14121f49a..b9879a9869b47491e090659ee594146fc9d78227 100644 GIT binary patch delta 206 zcmdnN^^bi*DC3mL8=3tk7O+qL&nz%;x8!7P7K6zwjC-PZ6%-UeSliIdNI}EV($K_6 z(@G)OGs-pCKh)2~Db&r)HAsPlfkBz!B#)0{aEMQ2yrYGis{ucn8V1%5hLa2@*cliY z7}Gd781ptiVN7B4@VivN;CBhAUyR{2zq@OQhhvaSxMPs3r=OcYR|5kV!)c(dJ#dx~ Z8wbNFpb1IL3=D3_)=mD;V#dV80075VHNpS@ delta 322 zcmeyzzJqH*C}ZBlM6Zbj+!I%8G8#<0`dWpBfkBwzB#)0{aEMQ2yrYGis{sRR2g6B* z6YLBO42%gJ9E=&8rI=C}^?)kH7*6rKyM}l;2DyYg2Dy6rx%qQ7FmN%P0;=BwX9+Pg zFqll<#VjpZl$fWGnOBmpke6CfqL7=PQks*h0F?a(bA*6suxFHOuz#qZi&LnZn`@9l zw4$Qy(G(dbKO)G^U*O1U4zj!}?*Px(yw;+Gtc&FeXBcP*n8BX(~ znIeW=G00=5As%C3AGfX z$%2Fo(TK(mMvdWK*z31F>e&?K5g8{fI0M~%3_|)~XhxBOyKk`53y&h-9|vDUy!HVu{pXd0$N*9Zqh?9fz}-!C~Z(5k0Pt=&3FG=o+RRueL6USXTG; zNG)rKB8w!nQ4Dt31FEvgO2m$mg>8AEE+$kwOurIvi%JOn*$AI5t~g=cjRJ7jUicIy zYXGkZ&%;*sK*nm1b~s;u{EdD!YaXk;;C2Y_FZ~@1!U6GTdaQ9$IE-`(>A^JAx6q%K z9v42~TL9?vV72%g+ob{WL$F#ZnVz~DMECLD|ig}1m9 z-wwN`VP_5GEarQF&si2>M01u}fcjj$A7@ zlFUeAXh@G$0k`#z;HU_11d(XZSHSLn2_h?5=MNH#*xB+Q3QcFP9iiiP+YujbO>9?) zr1`==NmR%~tU`?@VmgT@l6t8!c^K5hJ_a>+NJIIcCi;DWKauX1nRJg_-d&T!1Dd*7 z4al0dnYD_|xQqQ3tC_yGP6u1ww6tRFc|f_iWS5#H>Y1xFcjgL>k#;)!;(mG!<(*UGFHZn( zwt#U8sW<~G8bvTRx`6LE3N@|wk-F3S(Hk!Oy(WwU0Z0m$_9{+15&dZlKaPKfVX!hATF^iDfr1k!W|jR=RvV;rfP+GF9)?`dvW)nNX}d?LE;G`4ik6EjY&fxhmD%f|c)$724<1cR~a-GF{{t0IzK({FujXTvW zqH_s+!osuOO!u&Q}+*y)b_sk#-K}SHidV-a4-fa^Ip{5G(a*^l1aq zGf0mhokDsE=~n=TIMT0?zJT;B(tSwJA)Um^?kbhce^J&6uAjLhb-iB>WBw{ZEg)fS zmmbX5c1L%))&HXpgunQHY_qePDy?QU6?GO17ON{O;k(5ZR+#3wtebyV?B?Cr&GY#7 zPDe=d*aO$ht-uq$ng3yexYDLM(~lE4V+`&7c=z~II0J}`YBh`beOb+7RKCZkwWC)( z6{>FIJIzWu?F&0DoV+8Ekv+c9dW=h0mcqecK05i&H}>D7RILANbeR9|g$qj-=t93= zDEfUZ`n?Z*2i|E1j0w$)X5P`BGV?QUuL5ol7y!oVX5J-Y`tCUsKMvgZ9^x{K>E&}K hZTE)HSf*nQSfOUo^Ns~d7I+`Cgbc?Q{81qs`~eNdtUmw% diff --git a/OS/MMU/MMU.a b/OS/MMU/MMU.a index 9d6dd41..1d3192d 100644 --- a/OS/MMU/MMU.a +++ b/OS/MMU/MMU.a @@ -121,7 +121,7 @@ PRINT OFF LOAD 'StandardEqu.d' INCLUDE 'HardwarePrivateEqu.a' - INCLUDE 'SoundPrivate.a' +; INCLUDE 'SoundPrivate.a' INCLUDE 'MMUEqu.a' INCLUDE 'BootEqu.a' INCLUDE 'UniversalEqu.a' diff --git a/OS/MMU/MMU.make b/OS/MMU/MMU.make index 2310492..2dca08a 100644 --- a/OS/MMU/MMU.make +++ b/OS/MMU/MMU.make @@ -15,14 +15,13 @@ MMUObjs = "{ObjDir}MMU.a.o" "{ObjDir}MMUTables.a.o" ¶ "{ObjDir}GetReal.a.o" -# "{LibDir}MMU.lib" Ä {MMUObjs} -# Lib {StdLibOpts} {MMUObjs} -o "{Targ}" +"{LibDir}MMU.lib" Ä {MMUObjs} + Lib {StdLibOpts} {MMUObjs} -o "{Targ}" "{ObjDir}MMU.a.o" Ä "{ObjDir}StandardEqu.d" ¶ "{IntAIncludes}HardwarePrivateEqu.a" ¶ - "{IntAIncludes}SoundPrivate.a" ¶ "{AIncludes}HardwareEqu.a" ¶ "{IntAIncludes}MMUEqu.a" ¶ "{IntAIncludes}BootEqu.a" ¶