From 5a0785d5d8daa6ef295effad5e257c4d23581992 Mon Sep 17 00:00:00 2001 From: Elliot Nunn Date: Mon, 13 Nov 2017 22:05:40 +0800 Subject: [PATCH] Correctly reverse Standard and Interface libs Previously these were lumped in with Lastly. Now they are unlinked and correctly labelled, and Lastly contains only a small amount of PowerPC- specific code. --- BuildResults/RISC/Lib/Lastly.lib | Bin 21276 -> 1336 bytes BuildResults/RISC/Lib/RomInterface.Lib | Bin 0 -> 13130 bytes BuildResults/RISC/Lib/RomStandardLib.lib | Bin 0 -> 4162 bytes Make/MainCode.Make | 14 ++++++++------ 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 BuildResults/RISC/Lib/RomInterface.Lib create mode 100644 BuildResults/RISC/Lib/RomStandardLib.lib diff --git a/BuildResults/RISC/Lib/Lastly.lib b/BuildResults/RISC/Lib/Lastly.lib index f0a7147d6c70c1198f2230212b295e8dd198ed39..23f313f86b8c1de8daa79f65910eac093bcdd229 100644 GIT binary patch delta 140 zcmbQUjBy9o1S=*t*NHX~OpJMx8O1{;&-06#%*3cRna_Wg2*XJpAIIPjpU8Me3pZB- z2G$OSlbiSWmoTa@oZ@$P4e@XcatU_~a`p6c^XF<{;9@w%aFRg?#@ZYbXu!zCaC&lE jkd_R?X@(Q*3_!rf!NI@>V)$Ju0Ae-{hBK4T1O)&97?~!v literal 21276 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 Utv04^Bw?iZ(y_X~8}YFJ1yDb;z5oCK literal 0 HcmV?d00001 diff --git a/BuildResults/RISC/Lib/RomStandardLib.lib b/BuildResults/RISC/Lib/RomStandardLib.lib new file mode 100644 index 0000000000000000000000000000000000000000..20824035d30b1152f2c65a23f7e1f8db9cd255a0 GIT binary patch literal 4162 zcmd7V&1)M+6aes%qS|X!Nw#V!PAJK%A_56ctT?LTm|(QBR>-bo(p z{N9_l9uM;#Vk~ieIx{)_shWh;)tM}0l?j;10ew7o4%AF$a^@P$Dmh52SJlG+@VPRY zj7Ek)8BHZ8&VY}xciFlxyHGS3&i4DMH}RtD(oeRc)l2#qERL8ptGa6`$=Jl1&Xb^K zEmSRC1Ff!uRT+cqOcJzWRbRA znE47HK|B?vJJ_Z ziR3nfTma=hAi2;S%%(U0Xqjw!3-2xNoDBbGn^MInI5eZ2=JH5aAx4>Tgx%>EGoj2K zArnNI<07V{yw~(Vh50fl#C@DgyWzR8KX!iZN$iyM@}h_wh4Un1UGdl%cejtvLveFg z=)_QGoOCkJFj{<}VHQ|p^S-old*DWMrTZL`@&aG#x;c`tpd{S!VZeDOMtFD~7c@5o#9#qvhJ zD&MZu%WC(&_sJLMA>aGL_e=E6ldqk(&yYm2ZQn1CSy=M^On(~(Z#uEO8kU~=HJ{wb zt$g1x|FayB3c3DG&R_ zOc+-Wh0&|tci4-SP732rEDsj^p+xXl;l-LK|1x|Mq}=kYU#V(+FUDhR#GOUC39UU1 z4D>R#N;-!Vk29YfARix5Y~ehVkB@}gag42yQ@28Cs#`xcNs8AjI$Pu)Ex--Z{`~7% zbQz+}OT~C}DUq&<7LTsS6kRkEDm@lTaa2mTGm!c`lg;zG6_~=#1UrvcT^`jgiZGgk z#_WEf<$3Xy3rsw_hjzSprTE53&&!?9VE_G)%I%(TJ97!`o(Q`uXqO~|c8_d&s7IE! wXR(hc1bB};e@RW{l2FO-c|_j#oa$x&0)F2H?*IS* literal 0 HcmV?d00001 diff --git a/Make/MainCode.Make b/Make/MainCode.Make index c69bca3..8388b37 100644 --- a/Make/MainCode.Make +++ b/Make/MainCode.Make @@ -83,6 +83,8 @@ MainCodeLibs = "{LibDir}ScriptMgr.lib" ¶ "{LibDir}CQD.lib" ¶ "{LibDir}FontMgr.lib" ¶ + "{LibDir}RomInterface.Lib" ¶ + "{LibDir}RomStandardLib.lib" ¶ "{LibDir}Lastly.lib" ¶ # ¶ # Keep DispTable at end ¶ @@ -134,14 +136,14 @@ MainCodeLibs = Asm {StdAOpts} -o "{Targ}" "{PatchDir}MiscPatches.a" -"{LibDir}RomStandardLib.lib" Ä "{LibraryDir}StandardLib.o" ¶ - "{IfSrcDir}DuplicateModules.rom" - Lib {StdLibOpts} -o "{Targ}" "{LibraryDir}StandardLib.o" -df "{IfSrcDir}DuplicateModules.rom" +# "{LibDir}RomStandardLib.lib" Ä "{LibraryDir}StandardLib.o" ¶ +# "{IfSrcDir}DuplicateModules.rom" +# Lib {StdLibOpts} -o "{Targ}" "{LibraryDir}StandardLib.o" -df "{IfSrcDir}DuplicateModules.rom" -"{LibDir}RomInterface.Lib" Ä "{IfObjDir}Interface.o" ¶ - "{IfSrcDir}DuplicateModules.rom" - Lib {StdLibOpts} -o "{Targ}" "{IfObjDir}Interface.o" -df "{IfSrcDir}DuplicateModules.rom" +# "{LibDir}RomInterface.Lib" Ä "{IfObjDir}Interface.o" ¶ +# "{IfSrcDir}DuplicateModules.rom" +# Lib {StdLibOpts} -o "{Targ}" "{IfObjDir}Interface.o" -df "{IfSrcDir}DuplicateModules.rom" # Precompiled headers are not free. #