From 2ebd40b621ddf4600289bcd2102e895413dcc646 Mon Sep 17 00:00:00 2001 From: mkrsym1 Date: Sat, 8 Jul 2023 21:17:28 +0300 Subject: [PATCH] Internal rework to avoid a possible edge case --- game_payload/blob/tp6c.o | Bin 5928 -> 6328 bytes game_payload/meson.build | 11 +++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/game_payload/blob/tp6c.o b/game_payload/blob/tp6c.o index 157a80d6508f285c57bd8fb5580b0e0249d66a41..9f5820a1469de0644e3dc1e7de6b49b83144a7f4 100644 GIT binary patch delta 2032 zcmaKtYitx%6vyvur`z3W>6B8Sfzocv&{)LMRUWPKn87LBm8on<6H$H6k&w225L80TBkTX(-ER0`yxBeT zoBuiYG3TDSbGW+SKdGgsknq;05Yo^)Y5L?LnUL!)Laus*PGiSu@{obq~XXKbygQg#$0N2MHV5Eu`D$@Lx7~l z79)f@*hz@si055IFLZ0vXli^+O!+9at<;g{Y~oHw zFUH?T9Uy+xN1Kf$PE^{5@I+d-Bdc)wr6+t zmR2>^3NJXPvq_CTpJH#zb~V-jcCrgF;NR+Yk(7FW(vE7~Q2KYZqZ4kTxS{#@^5MELRgKKOGu#ok*1@wWp`-nsQns$kV|SA?}j8cR~sjFfd6bmyiGRx31+kG z(d1O&wTCVHTEPB>I(T%;{_$D6WK1MvOTiI8eiaD z2$R6651r~$!-t&eKkC%7ZayTHZqmqUiP|o!?zhgDsGSJhxkk^A(zyI4{wt{c9j*G> zvWIEakg1-q%n(A1JLeycDne8Oe#2=@$m$9CX-oRaEKeA@X2KI0OLo1Jnjt(FQ*^zz zCcfZCAaX{s>XK?KU(^?JU^(fmILL~HLI?(=ajWk8oi9!-w0Vt(M$QyO#*=FFSFGH0 zR{i5Vck>MLo1DYFboQZnbVWLz*rd>46467#^wazxE)8uDt z*^SY69N|;xCeqnK?OPL-ih`ujYtywRcA6JwZL&Z}BbE36@3j~i{ZIEwo^JlyjGTkN zt$Je5X=DJ&NT{*h50c4|4`5P7iS?tOspkMzK$ma&=cVDZv>d;x?;27T){ zHqqo&X^KLoNC#QOUGCqC(}K4UuKbKF25)WMwz;*bqrItZ`_878*3PCa+ge2sH|)6k zQn(f%ll8Ft{FBK}*g8Qyuuls57}QOaYI zGLs$kdZa>5(g6F+JKHtxVx>w2D^Wa>A_84iwtzdnS3q-(>;$g>> zlA>nJ$ahX6K7yx4>yp`BZz-$HEzIWIIg2gLJ?Kt-&Dho43U(#elf%DbSyEB2F*SSy zF}&sBpBms&TH)W%l#(rKnvlsEWpP^ZW|R$Sg?~mBJn azrbkx;7kp)Jgul1C6rb?pMRCtuKWxBF76Eg delta 1704 zcmaKsZEO@p7{_OO+q=EqUH4i7ZD?alU9cdQ7HzpxEVs$l&bE8fKxvUSwMk9mTa1C$ zkVtaD>k&4aODJQ|FC@ed1`Ux9qMY$1g|vcxQQp#q_`yUWEsCuP!M0M@|I97-kxBO1 z-~8v9XP((-XL3!a8zQe9DI>fkf`oLAM=HuDe1v>cM99&A&`H&J^BYBn{No>O*mTNI z$O$Dc14)83Cbm42??1G)fSjMLl{WZi;B!@BFGzL%S>P`UdkeS-ysfYkKm|)IDC|36 zC2(0`w}JIQImk+j>ijWaX^^!5DX=og27r5kbwPFn_$qL7kbPEE*K!cpf=%!y;Ymch z5_+%RqwmqX_w@GcricH`$%Ih*TGIYLy(EpSrH3bT%#Lk^A{xDy>2@1u%xd&b)DLGpa_S|gqrDdT~~Mf)ak5DFBYj|F$763`qZ(g07=cn z;X$2Z5z2Xzc%5H_H6i3(0z9eVdk*21rY7J>~j4QGZ zqnOg=^rEYdm7|hWTA=BRk|iyeHleBb^ym!DR{v|JCnYO>Ycx$AWNtb6WRvzC3w>%i zmXFGbT!h{^YDIPLeG-i1qsw$DY4o%RQ&PyVqjyLVaNc+If; zwSL3t*Y+89^%_Gx->(e}LtGyNG!I)Z=sxU5L19$&SwW2;eu2oOv!D%wo)g;5 z6tG#~UC?$xS8%NOA(F`qXp^AdK&^u2K~D<0585nf1@x4lQf#b2&}z^YLDir}K?gwj zg+B!CfEJL+XklbtE)mO@MlJhE)In diff --git a/game_payload/meson.build b/game_payload/meson.build index a4b1b99..2493845 100644 --- a/game_payload/meson.build +++ b/game_payload/meson.build @@ -51,7 +51,7 @@ if fs.exists('src/tp6.c') # another dirty hack copy_tp6c = find_program('copy_tp6c.sh') - tp6c = custom_target( + tp6c_target = [custom_target( 'copy_tp6c', output: 'tp6c.o', input: tp6c_fake_exe.extract_all_objects(recursive: false), @@ -60,10 +60,12 @@ if fs.exists('src/tp6.c') '@INPUT0@', '@OUTPUT0@', meson.current_source_dir() / 'blob/tp6c.o' ] - ) + )] + tp6c_blob = [] else message('Using precompiled tp6c blob. Refer to the readme for more details') - tp6c = 'blob/tp6c.o' + tp6c_target = [] + tp6c_blob = [ 'blob/tp6c.o' ] endif shared_library( @@ -71,7 +73,8 @@ shared_library( sources, res_header, res_object, - objects: tp6c, + tp6c_target, + objects: tp6c_blob, include_directories: include_dir, name_prefix: '' )