From 2978b37ae42436bab99f16ccddf95c36535d2385 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 30 Mar 2024 22:46:38 +1100 Subject: [PATCH] Update makefile --- .github/workflows/build_ds.yml | 2 +- .github/workflows/build_ps3.yml | 2 +- misc/ps3/ICON0.png | Bin 0 -> 9052 bytes misc/ps3/Makefile | 13 +++++++++---- 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 misc/ps3/ICON0.png diff --git a/.github/workflows/build_ds.yml b/.github/workflows/build_ds.yml index 24a4e19..02d90e3 100644 --- a/.github/workflows/build_ds.yml +++ b/.github/workflows/build_ds.yml @@ -23,7 +23,7 @@ jobs: # otherwise notify_failure doesn't work - name: Install curl when necessary if: ${{ always() && steps.compile.outcome == 'failure' }} - run: apt install curl + run: apt-get install -y curl - uses: ./.github/actions/notify_failure if: ${{ always() && steps.compile.outcome == 'failure' }} diff --git a/.github/workflows/build_ps3.yml b/.github/workflows/build_ps3.yml index d4678a7..d59b256 100644 --- a/.github/workflows/build_ps3.yml +++ b/.github/workflows/build_ps3.yml @@ -26,7 +26,7 @@ jobs: # otherwise notify_failure doesn't work - name: Install curl when necessary if: ${{ always() && steps.compile.outcome == 'failure' }} - run: apt install curl + run: apt-get install -y curl - uses: ./.github/actions/notify_failure if: ${{ always() && steps.compile.outcome == 'failure' }} with: diff --git a/misc/ps3/ICON0.png b/misc/ps3/ICON0.png new file mode 100644 index 0000000000000000000000000000000000000000..f6446f9ea4cbc29e7c270061edb12be210bb1cb4 GIT binary patch literal 9052 zcmeI2Ra6vEw}1gbx&@>pL^`FUMU);wnxUJayFc{7EEf(6dJf)yld)`pp zzRG<VQ+31quq|slsPzO>ZMa zZZwd5ZXvQusu9@PD-ds+T~d9MBqS&#C|iI^(ThQhfuX61jv2~)-r52Mwd6u6jX8%W(@oHn&`^&xz~rT zPUk1XaGjcw1fJy&MrLhFwcqd)gRNl38V3#^T0DVC+Z|4NLNkU5~xiWtK8UtXWUPekM{xOu<~a( zQ)sn{v&K^p&p_;}ecQuIPnq-XhTGk$n7+=Gh35E=zEe0P)7yzH)_NO@V*3C;c$}Sls)j5P+@;1<@>1_J^;}LnM14`e~iOb$l z9%%>RWIHT$@_+93JYhX=EG8}buNFJ*Y%lxb`}wHgwGcTd;(Dki_bZPr$U;R#3%&hqnYH}d!=u2kiNO69 zq_Zo{HxhZW+udt&B_E*Rrt;6hjLL4wvGE&3^7y&0#3w4h=yNUx@B~IaDE~E6{W$(~L!YVEAH66rZDlQMc96Te~UDsXT(7$5acG)|f&hMjMhkiRjgynY-n?Ytdb4|?1_kqUf}XlU-0 zum-2W{uyqFt{lL>j7K$87e@tq;f2NcxX@^aKZm2bl`?jD-tABwBa^l6^4s-;(_iHw zasQko#Vc-Z=OR-edfr~*0gwAz92>2|PDY#%i9a<3?m)fcm&CP~tT~*cZH&Gv&u0C{>;l8eL8YTUOYVw!QL_Tq}ACXzdKj1jK=5w-D# z{K5Q%$-KdY)<+~-G8kwxc~jF2DS^nP;J zdH4v_a#Bz+JV6*#Rn$JLl5zL2MM_G}ofZvv&oXO)VOkWc*y7}T{V15_B&MX3-Z$Lrnn@V zS#vVqgC2>I`9qr$z%gT5^NxwwWMiVbVXch~_(tnBV5tKq+72Javb({i3y?$y$}rJe zQn><_Tw3EYHv7v(QpV(iftZ$v3HR`ybt`CiNzKRonSLBfJaI|OBz6UDdWn-QqjQm7 zr5l}2t5OM=l;69aF5GvfS4+-RfU4C|dOgwKD3`cmyq)m4O^~9 z7LnMtl00iuPk@q* ztK!a++_dFMHG}{hOH!2a#?aS9ed`)$br)@u`EGdK#w0vd#Ta&eM2HSl!-DIBe#@1Y zjWz$_n$*xCm;3?)si^2_8*k`Y#6c)?GNTw=LBBDY>O*Fnt?XAlDZ-lhqJpt2?vsn- zi@(tf^_>R3Nd~Qn>%~~Va739773V-STK-FH3qB>P7r#*0zn)0>0Rv{yWDYKa$NN-t zP`d;SaclN5$UZI+^DeBa_|YsYUp^-QkT>`C4U=Mv_h0Si(!v9Xk(VIehc;}>f&m|V zPKtP?(9(F}a}6acc{ctjC95~BExa2o2_85ZI1}SmG_8D64K@awX}3#qDn~7G5C<4X zV}yTJd^=%~f5ISzpv$eO34SgbftNWEDi2TlYeX*Ik(%t`Vgb1wn-S~y?6R$yji4hz zT9hfX<1cV)3sy!w{KW4q@@PNC+GO%w`i_(byoiju8>$aOxD>mpen92m_YfwyhD?Pr zowqb{=(8ZNavUUR;p6-U%f>d_<%j-KZSUiJg-NIJ$=CJqk?#l(rY=Ht0*Y)%YaQ=7 z$;ICJXdOVrt+{7T#%|7jcFqo1FM;X*_l=SA(vlj0aJJkp=(I2wpg0>hej8TCKT57l z0IbJa(+O2_$pc-EyqL2{b8vi{XK|yTcc4w0z_P?x>MXSkQEfyG8iC73 zB9qC~zp6D*!XnA|XsV&4A0;2@mC&+N!`5L;c5pml3GK1(b_eUC_q5)c+^fYSd}$lh z>FGkFd*A!vbB#j&evc)24&2Ip_foQZX|FUFUMEM;uV(JYurpv~UbfGag)BR}vGLU5 z^p}3+SpH!jmN-}ndYo%^aQVw*Bk~&a7e@o73g{XEwI*jf)^ANhy6*OVLODsvxCmX@ zjeWZ`7)tEF}GI1my*D z(ahIVZL6RC3RUX94gD-Z?ShL^le!E2AB03i9RkQJit!y#eQuvzNA33*qyNZ&bC7ks zsSLVpS+{va(ofy3ThMXd8&v@E#%_Q@|c>hLd6v1k>6Q0_$0ruIZ@?-$o~`xPanr4Rn2+yB2U#RrDEM} zlgeY|D3f*F4++mKJ{X|OP~4!a&}dHb_p_XQsKZYU@^5oIJ|?lv@?mG@KlOE53eL*l zD-zc61j16#WLp5;plWxdW<&%+Zqks)?}w zHKEYzJh{PZjqI^Q6{qsOvn z*Erhcai^8UkdLnv@mT%>-r4Yf9QhHn-swy6io}7{PUTUqzw;{LjKxIAG*6)Uhv$G? z&j=7_JT3c6nRFgayAj!M^yZr8%%PyGyXoDWJrv7)3;*Pk(qw=Zt9(^DLNaLcf1L%B1d3K@PQMx$U{q7YNi7gYBubZW%>;s25IOK zq1DC~3&-ERx`nF3n-2sjxzVJ*2fH9(%G|Z7xr2s^!?!T3-YQhYu(m&wm2MZ7G@pn$UKPU=yn z2Lw%*X_WapRUnB}ORZ1EW^=uc8zAyW`CD66v2$?wh!*CLpP0YO=16|%d07f0F+rd7 z(DC1Vo%|^E$7vU11Sj-NpuQapRB@4&1Wx}uJcF8FW#ar`p_q=&pi}?L@(YeO^5DH8m&A-9Md999*jLTikmT5Gx2qY2F)$JQBToROo$m;r?o&{P# z*_9GaxitO903#~g2Fk2I8I-A|!*NWznPTe~!Og0t_I~6lG-$Iu2iaH2=2-KlTNCzj z-9J4;Pq;mISU5!8m6p%_7DJ9vu}`V{K~NL!5%yCm=i0#Y4aZcs?ijAI8eSW>I_+6w z*C=YdD5u@`W!Ugq4#3*mq9#dltB7U2Iq+?tM{0G26tQd`I_1-L`m8wAeuIK{!AunN z^^oIl2H&gi!GiwjXtH6j>0!-A6a2t^mn7Ny!u6C6O36w+2dCq_I#{Wu41T2FK)jR_ zpcmdCN2@s)r|>B4p2@cdjV5(__{V4h=aBo-eT&dTzgkZmH~stwAhpjzRgQ3~4{S~i zdVFlC@Vt{ueh1Z}w4>JIYqen4*7-CJGWe_fTzs-i-wO`zy)R+z4QpU7v7aK?ybgP7 zE@s#>9Z9=?jfvcmJ(~&X-e9xCLNyoO-s!SHT^p`yTuctyaPR-htj4K(Z_GQZzBItq zoKgS%p|~hpDVv(E>B7vXn$_@NYcxbtub0V?mgxv6QeS;`uVZVP@Gz?@Q*>kejU zd^3YE7xtRs(696@iP+KBF?#7Av$SNNLq5w@F{7?3_P;5WhTp&Lg^i0XuOl?r4G)SG3i&$4mDi>03ps9jf!QtB|N8(}g z3Q}KHtv5aF@8n)N&xQF6dtOK5%&#-^)9*D0XakD|f9ciez|92@g0i>_>K%ug|FQk8 zG8Yc;%nu!AV-|a7a`vA;^sQg@g=d)Gt_8l!3f1CpnqF}ci$P{~!VYI-VDF-^WK!on z{0cuYYeN)ss0z|iGRL-oz-ne);!*YjHIb2_zGx7EyBLf3aBPde;;#VU&+7Hld2;i; zzU~@Wa>GCD`V=ctk7+H39+&7;oE9FqP%Wq@lhev4_SMY%i~G&zZ;1c{Qi9zIy4q1~ zXOUqOsKyx*Ga4X>IL+J21MB-byTm@o;OH8^xQpCV@t9R7sdc0bctiEE`_@)y-wVavMC@jiX^r5+S_Nly(e?bKvNm{$8B6hH(H*m-8&BMrKB6vQ9LF32rho&X~ z2PfAoA%y_di7K{x|3U;8fpzhp_+5?#A6dQhwVWG?i|i3oqF4_K zsWt0N4{TkYzE-B5Y|U}PMo#X#Vrk6tnROEDg_;GQB|MZDvM1p)6myI?*%>SzpRne0 z941-EF;|!d$_t(E@6p92-VgLiKi^)Znr&Ezo8kSgcIM{u6IV0+PJ0NEez#(WoYXMQ z-gDh>p#Dp?V5HCjc>Gvvq{4P`8q;9@m5O;5Zi~a&qc$>gb(AXCkbI76saz#Kv~tEL zP=Ky6?L(TSKlgK3w?mKpTK)RRPO_{c1G@cQ6*b3F9LMt1p^AU0=_`!Gpx!T()0}_g zc<%GQ$Kn>@>aIQkJq*$9CB<6Y1)LWA=wcH@{+J$Qgpt=uwn#kj!iEmSNfmOF%)fk0 zF9LgtN9R9K2&tfkmaLCX)8qAVdN*ne-Db9p^d7|JNHbYW{(R3M;38%CV$_C-f!2Vri~x{Yy}OYp=K(FXfFd)AY4ON2t~6FYt3I= z)iv$@8MFgRvd_`p+?mQ47VN_QE0TGMI*(fC1BrH>#LpO*f>ps+$!PU*TEC#ojn^q;}v~CK`)pa03jRKn7NK8YB%ieg> zf5jGi>9b$Xd~Y#quwwlKl8}HA=L$Sf=Kne|9i!caDs@7^Igz$lkOoanAF~YlPQ^W1 zGtV5qFWcIby%$KwJI{uy5p)E&?pdg0!3|hF8@O-!pwu?kxK0?PnoD(lZ*Y5Z9=+LR zJ76E`{7eAQWk%L14A7NdM5%a$@jlZQi>mRV@i?yQc0cv-?c_+r>)6=bB@qK6NH7v; z=KtN}nG0o!jT+dJ7m1cUXP!e)=nVlo{O#`B9gG}+L50J9&Za*Pqzxy7ujSDwJ1avC z$gXhlSIX?SZ|&+qt(dJC+BWx4LD$b$vVP}pzaQDk0A24oyyc%18xvY31ueTVX6F<$ z1T9QX_B?a5SD)zz$@xwIxaT+}xV$tbNLyA?BCCbRg!aV0iDcHeW^T>y-FdLC%p4{K zYG@W&SwagFZS7ANfk|_#-v8^cDvA&vPH{v0+z;pN!=TX4&H6TO;}{Fmz)Cgr~{P9qcf}#A9HR z2L%z^!~##n3%YA5@Za*Mvn^8@PC0}OCKaHE0%eReYe%@+>_3XjMQYnyII<=tlQ@;svy=!@Bvl&=%>l97-Y>Yg;wnri-*7(q(nOA9mqZxXL z&}JQHFo_&L>qPsF_2)R3hhg+%T49-O9XxXu_?DoK@w9MxDcS7DtEcZMH?^CN<=%l$ zW*#dmX+QF?!2yc=;l#Chuc`Bd2`E$Vl~klbdmneo(n+;^>)Ji9LYlm=d{L-#O_b}t zKjYLew|+%tJ(a6eDOMOFr zEll;nFFR5z&o`N8i-~MZRV<|h>~myCS>6f%d`-Ti37hr2a~EA&2-nu#NR*y`3ddYe zT4YtP)>h(wnx0$#YJ)nEE3|qcfImsoz!?(8HZOdO`JzKI*9pMRi7D1Un(z1wXBRD- zJL?C?yih~;d646xwxw7>cwH(4qwk|kvFrgT>S{-Ozcc7=^N&j%e2r_cn-{O(nG8vS zy{W`8+_wk@3}yFo(3G?vRHAnLy`R1~tSzMU$4);B{wLhmuRWV}0L{8iQX`cYH_evM zxUrB#zpBJJ5j8Kc!6?oC_*SR9t;yV;w8Z3RR)2I

s?NAQaHvF%M60y+MR zwQliw$r8Iq#O$z5*P5*&P(R0*`;Yfu!I?@Tm~u?g`@rU!P8S{n{S3V!DUFJhl3Uxj zn`6SnSxI|52@N>>&VRTP1Y7^l~Zyv0<%VvuG?=#i=dQ+J^ekzn1D|g2NdDCJiTbm`5)xiKy zxO#zC1W$#wVlFcN2K69tUu#ynpbJ{~gz(sWka3B!ojd!jh+OI42!b04TUM8LhIos? z5BowwF;zuPPIo~=(XB=r+flW2qjfC!uH-u6mGFP?*KwF;_)$*ovVwW_r3W7k;`R5Ev9@~s>HLNsOb#$)@wz^ zkbsyaU%qO3On6<0-DU<^camoJz_z3fnULg_87vP}0;Ok<2x7zCyA6xyIK|e@XO~l$ zA>=bb`$Vp4g0(oJ3K}{21h1pdhd`xta~uC?8}nCoy~yMi3+P3X*}XE`+230OQo=5AQoO{}P%wzE2!-#>(l zLP{`NjM}U!PXpMA2&&ZzqhJgU9DlSc|AtZ2Vq=2$<&b5X+59J7)Z(@Nu7 zq8)Uzu7f+5vfB=O-cd$$R|QwZAs}KQLko)|2#UrRXyoYYUE%*fKJnk<6aS~Nl3`=W bqtxz)BuUlsipJ-O7!-vsDxYgUnS}fgW^;Mg literal 0 HcmV?d00001 diff --git a/misc/ps3/Makefile b/misc/ps3/Makefile index e859df9..e28411b 100644 --- a/misc/ps3/Makefile +++ b/misc/ps3/Makefile @@ -6,6 +6,9 @@ ifeq ($(strip $(PS3DEV)),) $(error "Please set PS3DEV in your environment. export PS3DEV=") endif +ifeq ($(strip $(PSL1GHT)),) +$(error "Please set PSL1GHT in your environment. export PSL1GHT=") +endif include $(PS3DEV)/ppu_rules @@ -17,13 +20,14 @@ include $(PS3DEV)/ppu_rules #--------------------------------------------------------------------------------- TARGET := ClassiCube-PS3 BUILD := build-ps3 -SOURCES := src -INCLUDES := +SOURCES := src third_party/bearssl/src +INCLUDES := third_party/bearssl/inc SHADERS := misc/ps3 TITLE := ClassiCube APPID := CUBE00200 CONTENTID := UP0001-$(APPID)_00-0000000000000000 +ICON0 := ../misc/ps3/ICON0.png #--------------------------------------------------------------------------------- # options for code generation #--------------------------------------------------------------------------------- @@ -31,7 +35,7 @@ CONTENTID := UP0001-$(APPID)_00-0000000000000000 CFLAGS = -O2 -DPLAT_PS3 -Wall -mcpu=cell -fno-math-errno $(MACHDEP) $(INCLUDE) CXXFLAGS = $(CFLAGS) -LDFLAGS = $(MACHDEP) -Wl,-Map,$(notdir $@).map +LDFLAGS = $(MACHDEP) -Wl,-Map,$(notdir $@).map -fno-use-linker-plugin #--------------------------------------------------------------------------------- # any extra libraries we wish to link with the project @@ -115,6 +119,7 @@ DEPENDS := $(OFILES:.o=.d) #--------------------------------------------------------------------------------- # main targets #--------------------------------------------------------------------------------- +$(OUTPUT).pkg: $(OUTPUT).self $(OUTPUT).self: $(OUTPUT).elf $(OUTPUT).elf: $(OFILES) @@ -136,4 +141,4 @@ $(OUTPUT).elf: $(OFILES) #--------------------------------------------------------------------------------- endif -#--------------------------------------------------------------------------------- \ No newline at end of file +#---------------------------------------------------------------------------------