From e5712a947437e97243903f3530ed4d50951e89bb Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 29 Jun 2019 15:39:20 -0700 Subject: [PATCH] Move dylibs into the Frameworks folder in the app bundle --- app/app.pro | 2 +- libs/mac/lib/libavcodec.58.dylib | Bin 3745824 -> 3745824 bytes libs/mac/lib/libavutil.56.dylib | Bin 481200 -> 481200 bytes scripts/generate-dmg.sh | 4 ---- 4 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/app.pro b/app/app.pro index 717f9522..56794409 100644 --- a/app/app.pro +++ b/app/app.pro @@ -367,7 +367,7 @@ macx { APP_BUNDLE_RESOURCES.files = moonlight.icns APP_BUNDLE_RESOURCES.path = Contents/Resources - APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true) + APP_BUNDLE_FRAMEWORKS.files = $$files(../libs/mac/Frameworks/*.framework, true) $$files(../libs/mac/lib/*.dylib, true) APP_BUNDLE_FRAMEWORKS.path = Contents/Frameworks QMAKE_BUNDLE_DATA += APP_BUNDLE_RESOURCES APP_BUNDLE_FRAMEWORKS diff --git a/libs/mac/lib/libavcodec.58.dylib b/libs/mac/lib/libavcodec.58.dylib index a8b94a0b870549aeac2514e266c8cfa04311f585..f6842ad50ae9f47d4521c9b5f400dc3228bbdde9 100755 GIT binary patch delta 1940 zcmajfc{JPU8VB(F5+atUeOIYaRK+hM@k=v`j&muxjzm#3MKzk(*D48Z4R=(FnzXi| zmb!{*6~XAe?bzyG)Yh6Q6QiwVETeX9(0QGEZ_k|j&wbAM{PDc+_nh~S_c>2-|2wD{ zxTOZ!KT>y+hMaSJq=^Q9iD2^rV?!e@MOtz>=h-p-p#g#ZBq~A*hzC6?M<_iBl8IR2 z-v3QTM{&3$D(yeP$Boz)sjC9{uLbfDfCeyt6d(;?0T}=X$O3Y}ZdL)n1B$>NKnYL= zQ~*^#4NwO(08Ky(&<1n>T|f`e2lfI600Gzs7y?AV2rvfr115keU_yRsaRC2B-iHun`I5k!gP_3xz^qfZZ|z&?r>+6BM-DM({q06?Xf(D6}-{-)E?1 zaB)sp5Q^wRA;L#TER1F36nDcYVN)pLNq94qSz*)2N;EdB4n)H^*D%LVwfMXqX8~@; z%e_6-PDBnvIs^=w72V2;LZw)H!IoIr1F6ob8+b@oifkxF5ERjiYI{BXWYcfBO1|VR z1S)rUYwK;z`mVhGq!l~sE+j7@d;fnbbP1W$4RW!jhJ@Q3_h2C|98a>FIea|I#)Ek} zjuk14UPcb_uNfN5$1nS3el;2}RqjzPbG~lSQ$GB}N<;o_Gz)v0@l2YRk*^lq-Tgl1 zqWrdX`t9dUt@!9m22jTP{^WQ1i_OKqrhmEk?H!XoE+kYf# zb-s;Sd#qqG9sbh?V$cwTmPIulO8U57V%uDtf**iWq%m*`X090Aq0u=0{v6ql8>$H~ z{_|f$^3o{y3K@n;SPWB2SiFiPsMD;d@NQAOH1XgG1g3#T2(KX=e*I-b2kM97PO(mE zvW{hu)!hlvzU=LOZt0VyJUXN8Uz~&AF;m{e_(r$sPdocQ@$>mxs1c?#4O_=-4|u?K zqSaKMk=KUCHAGPkHYYrFobom1&2bK1qqrrlLebQ9_r?+N-r#TiP^|3VH{XW5jh=)9 zF0*QaS0iSV2_>&=_}aN~cuMS@SI;ZL3xL>zZ=;j=9Y4+U}x?i$#@1UU^kME2_AYXlD!2-F2h_QadtUcVn7t zBpUq9u%L@vVV3pOcv1M(CSt_zGk*BKroOC8d_t!#_ritWaega7x~A$zC^$f4F*4&v zJ9A9x%HZft#blS1)^^I4NNN&eHe%0xp|<~%YU;)F1+yBxC)2JL;)E*Cn`b@KqmTALEd0(5TPoEK$R>l4c$1(r=cqyIgWFp z<`|Cw2`4k~LH+8$l=5KN<}(w8MRu5>zBi-lo$rlFE_4Bs1m9~|?M=QyP_fRqYyAUh z6Y3l4&e_-8JlJK~&vuXc(5c8i7W*`=w>>e4@sGq;OEWU9->%HIhmky+6RtnDg}G#9 zf=A1a6I-FXfkN*bUQJSN^UJlk7q zd8NmfBO0FOC7e;^T*@LG5$`dQE-P*1izUQ&>kPS{tE}UPbBOg0nWX0yrt?wH)qlIi z%ueX&GcQ}2bmca@?2@yUF>`CZe$QR9CT}gur{lAF>+?(<8N8=!124VSnf#qH1_8=D zbt~GRr+-4SIq^p6@cxRCBzjaL?A^-$`**2<89o!Vww-aiBqZ*d+h6s1f8E1C&yhu0 IQuHw59~f;u3IG5A delta 1913 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 bqnf!U>xu52tWZd}NPmQ+3c2s!T^#Tyw`=7^ delta 1959 zcmdn6UUtKJ*$E2vvoJbL=4DkD%gIdA2jaxC(vr*^JySEilu96Xvmfgu_GwR; zIhr5vv_Ifs1Y#y2W(HywAZFeEfQRk+7t<651_ovz1_2cyW@2FAyTHH*;_}!0y2k_J zuVG*UQV`Gsq)ev2VPuzPbewL%rrjl1zKZ_*u1)E@X)yXG4J#j3hZ)(RjDbmzm|42&v)^&%!{-v$v1OxHnX&F zEpZHR_BJX_G?}iW#BNo;(wwpD!i6VoK0%5JNt5T+U48NH(TS-uZ`Q=rO0%~gUEPtl zYnHSFx51|mzqSIz$e)2quK+rE5u>RoVB*ngFGp~=BBS7!b& zc)pkKMvUQ9qqkKlFIitNkVBt#gM^B@`~CE<_ZLh)T02Ye1l#Lx(z@cVPuTUfmgX<+ zKUrGqbwxXPA>L;#yqZTyr zUNmT8Wj1JHe!T!F#l*ys*(qFQ-MEHxx~&TP6j6{)17jeH66XaPWCX+p#?zmvuxHkv zn0>7#zxKqFuRBz$($uwueB3VmITWdI|7R#Kht8%G+Z12B+)(%2*ISx%;^<2s+rz6K z26X)mRDS7pz56S3d&n1$87nj7dkt)sN`4K!xg}ximNf>G?!B#Mi}JRZxbD+A9YfXY zDYyGy3Tf{8q-=EMl1pOJFBnCSN&5=_k%{ zetHRMGlkcR#PZgzm0mJEdTZ9fp3HxSrzGSqx=vm4G)?+w=A*BQt0o=v->-3E{q)OI z52q$1g`N?MVp1*K?yttaj8SBvT9^1fC1Wnd__`C!g;UB7#OygVol}EdrQWM9x=b?4 zjIC;lz{*2h3ezQT>Z+fPt;v{azw&QhQ$hM1rf2feF&Y1SOlRzTmE?TyslA#^l`O}( z4X!UZF60SjJ-GG4Sx=(+`s@>~|MV6{FRV!6GP!U=S*UOMH&M+wA5`Wzs7zay_hN@9 z&wSGvr{}KPA^YN``kP(r6V5C+$Fs1te!^pqwGKs--`kv=D86ZXVB^%Lua_=oewCeF zFgY~Oh0{Z({NR$mcK4$0{h4uY9@Dq$RnsTR|GV@0^vm^v4l?aJK})tpzUX_CbYz2I zj#%8rQ(Jf2CeOQSYdPpeH#{oKa9 zrh%oA>BqJ0x|-|}oQOo#Ys79>kCYshk;@Y?77?EfFV&0Z7#_^v_|wt5!M!M7t~%X7 zn~fV*=m;?J7|Iw(8Auoa70V>aN))%(wz@aSP5Zvg=E$p;*$WML;U+RNvNEtVF*11V z4c$<%{jBi1>665nl_NUpk81do%M1NYTe6IUF>R{Ff!ae;1&>Y-JHCF|i}^Kvu0Q{L zt~v3?%!*@mdzHirmCGCQH*s^k?$2yX)4Apw`IGl@yrlEQ?CEWy9rv;WYzy|zohs15 zz@v2_VQy`W$(^;Q4_E1)zFq$_!K)|2v|@XQ)`>s-V(-^wR;yl$TfXl>-H!Tu9sZG% z9(y=^>fv)<`*~&NdQaOQtl7NBijM8k_xCS1QV7pWSzB84%jqb8l;WXJED{0wOBbw2 zuH&-ZUvgwsV9JKpj0dqxLT}jZymqm#O{U@0yj>H!wplHD&(j*YWX8oJ3?>5rgtj@F diff --git a/scripts/generate-dmg.sh b/scripts/generate-dmg.sh index 11544965..60dcee45 100755 --- a/scripts/generate-dmg.sh +++ b/scripts/generate-dmg.sh @@ -42,10 +42,6 @@ dsymutil app/Moonlight.app/Contents/MacOS/Moonlight -o Moonlight-$VERSION.dsym | cp -R Moonlight-$VERSION.dsym $INSTALLER_FOLDER || fail "dSYM copy failed!" popd -echo Copying dylib dependencies -mkdir $BUILD_FOLDER/app/Moonlight.app/Contents/lib -cp $SOURCE_ROOT/libs/mac/lib/*.dylib $BUILD_FOLDER/app/Moonlight.app/Contents/lib/ || fail "Dylib copy failed!" - echo Creating app bundle EXTRA_ARGS= if [ "$BUILD_CONFIG" == "Debug" ]; then EXTRA_ARGS="$EXTRA_ARGS -use-debug-libs"; fi